From ee5b7f21ac206aa4a8c1ed54484526a26cab2064 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 14 十一月 2018 14:29:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/U3DRepository

---
 ChannelDiff/iOS/424064855/xlua/libxlua.a          |    0 
 ChannelDiff/iOS/815035927/xlua/libxlua.a          |    0 
 ChannelDiff/iOS/mrgameios/xlua/libxlua.a          |    0 
 Android/release/libs/armeabi-v7a/libxlua.so       |    0 
 ChannelDiff/iOS/828115704/xlua/HotfixFlags.cpp    |   37 +++++
 Android/test/libs/x86/libxlua.so                  |    0 
 Android/test/libs/x86/liblzma.so                  |    0 
 ChannelDiff/iOS/508021130/xlua/HotfixFlags.cpp    |   37 +++++
 ChannelDiff/iOS/mrgameios/xlua/HotfixFlags.cpp    |   37 +++++
 ChannelDiff/iOS/jsgameios/xlua/libxlua.a          |    0 
 ChannelDiff/iOS/828115704/xlua/libxlua.a          |    0 
 ChannelDiff/iOS/424064855/xlua/HotfixFlags.cpp    |   37 +++++
 ChannelDiff/iOS/508021130/xlua/libxlua.a          |    0 
 ChannelDiff/iOS/815035927/xlua/HotfixFlags.cpp    |   37 +++++
 ChannelDiff/iOS/jisugameios/xlua/libxlua.a        |    0 
 ChannelDiff/iOS/spyxxzios/xlua/HotfixFlags.cpp    |   37 +++++
 ChannelDiff/iOS/jsgameios/xlua/HotfixFlags.cpp    |   37 +++++
 ChannelDiff/iOS/spyxxzios/xlua/libxlua.a          |    0 
 ChannelDiff/iOS/jisusnyjjios/xlua/libxlua.a       |    0 
 Android/test/libs/armeabi-v7a/libxlua.so          |    0 
 ChannelDiff/iOS/1030013326/xlua/libxlua.a         |    0 
 Android/release/libs/x86/libxlua.so               |    0 
 ChannelDiff/iOS/jisusnyjjios/xlua/HotfixFlags.cpp |   37 +++++
 Android/test/libs/x86_64/liblzma.zip              |    0 
 Android/test/libs/armeabi-v7a/liblzma.so          |    0 
 ChannelDiff/iOS/jisugameios/xlua/HotfixFlags.cpp  |   37 +++++
 ChannelDiff/iOS/1030013326/xlua/HotfixFlags.cpp   |   37 +++++
 27 files changed, 370 insertions(+), 0 deletions(-)

diff --git a/Android/release/libs/armeabi-v7a/libxlua.so b/Android/release/libs/armeabi-v7a/libxlua.so
new file mode 100644
index 0000000..974ad1f
--- /dev/null
+++ b/Android/release/libs/armeabi-v7a/libxlua.so
Binary files differ
diff --git a/Android/release/libs/x86/libxlua.so b/Android/release/libs/x86/libxlua.so
new file mode 100644
index 0000000..8aa1812
--- /dev/null
+++ b/Android/release/libs/x86/libxlua.so
Binary files differ
diff --git a/Android/test/libs/armeabi-v7a/liblzma.so b/Android/test/libs/armeabi-v7a/liblzma.so
new file mode 100644
index 0000000..8234bec
--- /dev/null
+++ b/Android/test/libs/armeabi-v7a/liblzma.so
Binary files differ
diff --git a/Android/test/libs/armeabi-v7a/libxlua.so b/Android/test/libs/armeabi-v7a/libxlua.so
new file mode 100644
index 0000000..974ad1f
--- /dev/null
+++ b/Android/test/libs/armeabi-v7a/libxlua.so
Binary files differ
diff --git a/Android/test/libs/x86/liblzma.so b/Android/test/libs/x86/liblzma.so
new file mode 100644
index 0000000..b8db604
--- /dev/null
+++ b/Android/test/libs/x86/liblzma.so
Binary files differ
diff --git a/Android/test/libs/x86/libxlua.so b/Android/test/libs/x86/libxlua.so
new file mode 100644
index 0000000..8aa1812
--- /dev/null
+++ b/Android/test/libs/x86/libxlua.so
Binary files differ
diff --git a/Android/test/libs/x86_64/liblzma.zip b/Android/test/libs/x86_64/liblzma.zip
new file mode 100644
index 0000000..a5a0a21
--- /dev/null
+++ b/Android/test/libs/x86_64/liblzma.zip
Binary files differ
diff --git a/ChannelDiff/iOS/1030013326/xlua/HotfixFlags.cpp b/ChannelDiff/iOS/1030013326/xlua/HotfixFlags.cpp
new file mode 100644
index 0000000..6451497
--- /dev/null
+++ b/ChannelDiff/iOS/1030013326/xlua/HotfixFlags.cpp
@@ -0,0 +1,37 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+int* xlua_hotfix_flags = NULL;
+int xlua_hotfix_flags_len = 0;
+
+extern "C" {
+
+int xlua_get_hotfix_flag(int idx) {
+	if (idx >= xlua_hotfix_flags_len) {
+		return 0;
+	} else {
+		return xlua_hotfix_flags[idx];
+	}
+}
+
+void xlua_set_hotfix_flag(int idx, int flag) {
+	int i = 0;
+        int* new_hotfix_flags = NULL;
+	if (idx >= xlua_hotfix_flags_len) {
+		if (xlua_hotfix_flags == NULL) {
+			xlua_hotfix_flags = (int*)malloc((idx + 1) * sizeof(int));
+		} else {
+			new_hotfix_flags = (int*)realloc(xlua_hotfix_flags, (idx + 1) * sizeof(int));
+                        if (NULL == new_hotfix_flags) { // just skip operation
+                            return;
+                        }
+                        xlua_hotfix_flags = new_hotfix_flags;
+		}
+		for(i = xlua_hotfix_flags_len; i < (idx + 1); i++) {
+			xlua_hotfix_flags[i] = 0;
+		}
+                xlua_hotfix_flags_len = idx + 1;
+	} 
+	xlua_hotfix_flags[idx] = flag;
+}
+}
diff --git a/ChannelDiff/iOS/1030013326/xlua/libxlua.a b/ChannelDiff/iOS/1030013326/xlua/libxlua.a
new file mode 100644
index 0000000..3404c1b
--- /dev/null
+++ b/ChannelDiff/iOS/1030013326/xlua/libxlua.a
Binary files differ
diff --git a/ChannelDiff/iOS/424064855/xlua/HotfixFlags.cpp b/ChannelDiff/iOS/424064855/xlua/HotfixFlags.cpp
new file mode 100644
index 0000000..6451497
--- /dev/null
+++ b/ChannelDiff/iOS/424064855/xlua/HotfixFlags.cpp
@@ -0,0 +1,37 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+int* xlua_hotfix_flags = NULL;
+int xlua_hotfix_flags_len = 0;
+
+extern "C" {
+
+int xlua_get_hotfix_flag(int idx) {
+	if (idx >= xlua_hotfix_flags_len) {
+		return 0;
+	} else {
+		return xlua_hotfix_flags[idx];
+	}
+}
+
+void xlua_set_hotfix_flag(int idx, int flag) {
+	int i = 0;
+        int* new_hotfix_flags = NULL;
+	if (idx >= xlua_hotfix_flags_len) {
+		if (xlua_hotfix_flags == NULL) {
+			xlua_hotfix_flags = (int*)malloc((idx + 1) * sizeof(int));
+		} else {
+			new_hotfix_flags = (int*)realloc(xlua_hotfix_flags, (idx + 1) * sizeof(int));
+                        if (NULL == new_hotfix_flags) { // just skip operation
+                            return;
+                        }
+                        xlua_hotfix_flags = new_hotfix_flags;
+		}
+		for(i = xlua_hotfix_flags_len; i < (idx + 1); i++) {
+			xlua_hotfix_flags[i] = 0;
+		}
+                xlua_hotfix_flags_len = idx + 1;
+	} 
+	xlua_hotfix_flags[idx] = flag;
+}
+}
diff --git a/ChannelDiff/iOS/424064855/xlua/libxlua.a b/ChannelDiff/iOS/424064855/xlua/libxlua.a
new file mode 100644
index 0000000..3404c1b
--- /dev/null
+++ b/ChannelDiff/iOS/424064855/xlua/libxlua.a
Binary files differ
diff --git a/ChannelDiff/iOS/508021130/xlua/HotfixFlags.cpp b/ChannelDiff/iOS/508021130/xlua/HotfixFlags.cpp
new file mode 100644
index 0000000..6451497
--- /dev/null
+++ b/ChannelDiff/iOS/508021130/xlua/HotfixFlags.cpp
@@ -0,0 +1,37 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+int* xlua_hotfix_flags = NULL;
+int xlua_hotfix_flags_len = 0;
+
+extern "C" {
+
+int xlua_get_hotfix_flag(int idx) {
+	if (idx >= xlua_hotfix_flags_len) {
+		return 0;
+	} else {
+		return xlua_hotfix_flags[idx];
+	}
+}
+
+void xlua_set_hotfix_flag(int idx, int flag) {
+	int i = 0;
+        int* new_hotfix_flags = NULL;
+	if (idx >= xlua_hotfix_flags_len) {
+		if (xlua_hotfix_flags == NULL) {
+			xlua_hotfix_flags = (int*)malloc((idx + 1) * sizeof(int));
+		} else {
+			new_hotfix_flags = (int*)realloc(xlua_hotfix_flags, (idx + 1) * sizeof(int));
+                        if (NULL == new_hotfix_flags) { // just skip operation
+                            return;
+                        }
+                        xlua_hotfix_flags = new_hotfix_flags;
+		}
+		for(i = xlua_hotfix_flags_len; i < (idx + 1); i++) {
+			xlua_hotfix_flags[i] = 0;
+		}
+                xlua_hotfix_flags_len = idx + 1;
+	} 
+	xlua_hotfix_flags[idx] = flag;
+}
+}
diff --git a/ChannelDiff/iOS/508021130/xlua/libxlua.a b/ChannelDiff/iOS/508021130/xlua/libxlua.a
new file mode 100644
index 0000000..3404c1b
--- /dev/null
+++ b/ChannelDiff/iOS/508021130/xlua/libxlua.a
Binary files differ
diff --git a/ChannelDiff/iOS/815035927/xlua/HotfixFlags.cpp b/ChannelDiff/iOS/815035927/xlua/HotfixFlags.cpp
new file mode 100644
index 0000000..6451497
--- /dev/null
+++ b/ChannelDiff/iOS/815035927/xlua/HotfixFlags.cpp
@@ -0,0 +1,37 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+int* xlua_hotfix_flags = NULL;
+int xlua_hotfix_flags_len = 0;
+
+extern "C" {
+
+int xlua_get_hotfix_flag(int idx) {
+	if (idx >= xlua_hotfix_flags_len) {
+		return 0;
+	} else {
+		return xlua_hotfix_flags[idx];
+	}
+}
+
+void xlua_set_hotfix_flag(int idx, int flag) {
+	int i = 0;
+        int* new_hotfix_flags = NULL;
+	if (idx >= xlua_hotfix_flags_len) {
+		if (xlua_hotfix_flags == NULL) {
+			xlua_hotfix_flags = (int*)malloc((idx + 1) * sizeof(int));
+		} else {
+			new_hotfix_flags = (int*)realloc(xlua_hotfix_flags, (idx + 1) * sizeof(int));
+                        if (NULL == new_hotfix_flags) { // just skip operation
+                            return;
+                        }
+                        xlua_hotfix_flags = new_hotfix_flags;
+		}
+		for(i = xlua_hotfix_flags_len; i < (idx + 1); i++) {
+			xlua_hotfix_flags[i] = 0;
+		}
+                xlua_hotfix_flags_len = idx + 1;
+	} 
+	xlua_hotfix_flags[idx] = flag;
+}
+}
diff --git a/ChannelDiff/iOS/815035927/xlua/libxlua.a b/ChannelDiff/iOS/815035927/xlua/libxlua.a
new file mode 100644
index 0000000..3404c1b
--- /dev/null
+++ b/ChannelDiff/iOS/815035927/xlua/libxlua.a
Binary files differ
diff --git a/ChannelDiff/iOS/828115704/xlua/HotfixFlags.cpp b/ChannelDiff/iOS/828115704/xlua/HotfixFlags.cpp
new file mode 100644
index 0000000..6451497
--- /dev/null
+++ b/ChannelDiff/iOS/828115704/xlua/HotfixFlags.cpp
@@ -0,0 +1,37 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+int* xlua_hotfix_flags = NULL;
+int xlua_hotfix_flags_len = 0;
+
+extern "C" {
+
+int xlua_get_hotfix_flag(int idx) {
+	if (idx >= xlua_hotfix_flags_len) {
+		return 0;
+	} else {
+		return xlua_hotfix_flags[idx];
+	}
+}
+
+void xlua_set_hotfix_flag(int idx, int flag) {
+	int i = 0;
+        int* new_hotfix_flags = NULL;
+	if (idx >= xlua_hotfix_flags_len) {
+		if (xlua_hotfix_flags == NULL) {
+			xlua_hotfix_flags = (int*)malloc((idx + 1) * sizeof(int));
+		} else {
+			new_hotfix_flags = (int*)realloc(xlua_hotfix_flags, (idx + 1) * sizeof(int));
+                        if (NULL == new_hotfix_flags) { // just skip operation
+                            return;
+                        }
+                        xlua_hotfix_flags = new_hotfix_flags;
+		}
+		for(i = xlua_hotfix_flags_len; i < (idx + 1); i++) {
+			xlua_hotfix_flags[i] = 0;
+		}
+                xlua_hotfix_flags_len = idx + 1;
+	} 
+	xlua_hotfix_flags[idx] = flag;
+}
+}
diff --git a/ChannelDiff/iOS/828115704/xlua/libxlua.a b/ChannelDiff/iOS/828115704/xlua/libxlua.a
new file mode 100644
index 0000000..3404c1b
--- /dev/null
+++ b/ChannelDiff/iOS/828115704/xlua/libxlua.a
Binary files differ
diff --git a/ChannelDiff/iOS/jisugameios/xlua/HotfixFlags.cpp b/ChannelDiff/iOS/jisugameios/xlua/HotfixFlags.cpp
new file mode 100644
index 0000000..6451497
--- /dev/null
+++ b/ChannelDiff/iOS/jisugameios/xlua/HotfixFlags.cpp
@@ -0,0 +1,37 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+int* xlua_hotfix_flags = NULL;
+int xlua_hotfix_flags_len = 0;
+
+extern "C" {
+
+int xlua_get_hotfix_flag(int idx) {
+	if (idx >= xlua_hotfix_flags_len) {
+		return 0;
+	} else {
+		return xlua_hotfix_flags[idx];
+	}
+}
+
+void xlua_set_hotfix_flag(int idx, int flag) {
+	int i = 0;
+        int* new_hotfix_flags = NULL;
+	if (idx >= xlua_hotfix_flags_len) {
+		if (xlua_hotfix_flags == NULL) {
+			xlua_hotfix_flags = (int*)malloc((idx + 1) * sizeof(int));
+		} else {
+			new_hotfix_flags = (int*)realloc(xlua_hotfix_flags, (idx + 1) * sizeof(int));
+                        if (NULL == new_hotfix_flags) { // just skip operation
+                            return;
+                        }
+                        xlua_hotfix_flags = new_hotfix_flags;
+		}
+		for(i = xlua_hotfix_flags_len; i < (idx + 1); i++) {
+			xlua_hotfix_flags[i] = 0;
+		}
+                xlua_hotfix_flags_len = idx + 1;
+	} 
+	xlua_hotfix_flags[idx] = flag;
+}
+}
diff --git a/ChannelDiff/iOS/jisugameios/xlua/libxlua.a b/ChannelDiff/iOS/jisugameios/xlua/libxlua.a
new file mode 100644
index 0000000..3404c1b
--- /dev/null
+++ b/ChannelDiff/iOS/jisugameios/xlua/libxlua.a
Binary files differ
diff --git a/ChannelDiff/iOS/jisusnyjjios/xlua/HotfixFlags.cpp b/ChannelDiff/iOS/jisusnyjjios/xlua/HotfixFlags.cpp
new file mode 100644
index 0000000..6451497
--- /dev/null
+++ b/ChannelDiff/iOS/jisusnyjjios/xlua/HotfixFlags.cpp
@@ -0,0 +1,37 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+int* xlua_hotfix_flags = NULL;
+int xlua_hotfix_flags_len = 0;
+
+extern "C" {
+
+int xlua_get_hotfix_flag(int idx) {
+	if (idx >= xlua_hotfix_flags_len) {
+		return 0;
+	} else {
+		return xlua_hotfix_flags[idx];
+	}
+}
+
+void xlua_set_hotfix_flag(int idx, int flag) {
+	int i = 0;
+        int* new_hotfix_flags = NULL;
+	if (idx >= xlua_hotfix_flags_len) {
+		if (xlua_hotfix_flags == NULL) {
+			xlua_hotfix_flags = (int*)malloc((idx + 1) * sizeof(int));
+		} else {
+			new_hotfix_flags = (int*)realloc(xlua_hotfix_flags, (idx + 1) * sizeof(int));
+                        if (NULL == new_hotfix_flags) { // just skip operation
+                            return;
+                        }
+                        xlua_hotfix_flags = new_hotfix_flags;
+		}
+		for(i = xlua_hotfix_flags_len; i < (idx + 1); i++) {
+			xlua_hotfix_flags[i] = 0;
+		}
+                xlua_hotfix_flags_len = idx + 1;
+	} 
+	xlua_hotfix_flags[idx] = flag;
+}
+}
diff --git a/ChannelDiff/iOS/jisusnyjjios/xlua/libxlua.a b/ChannelDiff/iOS/jisusnyjjios/xlua/libxlua.a
new file mode 100644
index 0000000..3404c1b
--- /dev/null
+++ b/ChannelDiff/iOS/jisusnyjjios/xlua/libxlua.a
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/xlua/HotfixFlags.cpp b/ChannelDiff/iOS/jsgameios/xlua/HotfixFlags.cpp
new file mode 100644
index 0000000..6451497
--- /dev/null
+++ b/ChannelDiff/iOS/jsgameios/xlua/HotfixFlags.cpp
@@ -0,0 +1,37 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+int* xlua_hotfix_flags = NULL;
+int xlua_hotfix_flags_len = 0;
+
+extern "C" {
+
+int xlua_get_hotfix_flag(int idx) {
+	if (idx >= xlua_hotfix_flags_len) {
+		return 0;
+	} else {
+		return xlua_hotfix_flags[idx];
+	}
+}
+
+void xlua_set_hotfix_flag(int idx, int flag) {
+	int i = 0;
+        int* new_hotfix_flags = NULL;
+	if (idx >= xlua_hotfix_flags_len) {
+		if (xlua_hotfix_flags == NULL) {
+			xlua_hotfix_flags = (int*)malloc((idx + 1) * sizeof(int));
+		} else {
+			new_hotfix_flags = (int*)realloc(xlua_hotfix_flags, (idx + 1) * sizeof(int));
+                        if (NULL == new_hotfix_flags) { // just skip operation
+                            return;
+                        }
+                        xlua_hotfix_flags = new_hotfix_flags;
+		}
+		for(i = xlua_hotfix_flags_len; i < (idx + 1); i++) {
+			xlua_hotfix_flags[i] = 0;
+		}
+                xlua_hotfix_flags_len = idx + 1;
+	} 
+	xlua_hotfix_flags[idx] = flag;
+}
+}
diff --git a/ChannelDiff/iOS/jsgameios/xlua/libxlua.a b/ChannelDiff/iOS/jsgameios/xlua/libxlua.a
new file mode 100644
index 0000000..3404c1b
--- /dev/null
+++ b/ChannelDiff/iOS/jsgameios/xlua/libxlua.a
Binary files differ
diff --git a/ChannelDiff/iOS/mrgameios/xlua/HotfixFlags.cpp b/ChannelDiff/iOS/mrgameios/xlua/HotfixFlags.cpp
new file mode 100644
index 0000000..6451497
--- /dev/null
+++ b/ChannelDiff/iOS/mrgameios/xlua/HotfixFlags.cpp
@@ -0,0 +1,37 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+int* xlua_hotfix_flags = NULL;
+int xlua_hotfix_flags_len = 0;
+
+extern "C" {
+
+int xlua_get_hotfix_flag(int idx) {
+	if (idx >= xlua_hotfix_flags_len) {
+		return 0;
+	} else {
+		return xlua_hotfix_flags[idx];
+	}
+}
+
+void xlua_set_hotfix_flag(int idx, int flag) {
+	int i = 0;
+        int* new_hotfix_flags = NULL;
+	if (idx >= xlua_hotfix_flags_len) {
+		if (xlua_hotfix_flags == NULL) {
+			xlua_hotfix_flags = (int*)malloc((idx + 1) * sizeof(int));
+		} else {
+			new_hotfix_flags = (int*)realloc(xlua_hotfix_flags, (idx + 1) * sizeof(int));
+                        if (NULL == new_hotfix_flags) { // just skip operation
+                            return;
+                        }
+                        xlua_hotfix_flags = new_hotfix_flags;
+		}
+		for(i = xlua_hotfix_flags_len; i < (idx + 1); i++) {
+			xlua_hotfix_flags[i] = 0;
+		}
+                xlua_hotfix_flags_len = idx + 1;
+	} 
+	xlua_hotfix_flags[idx] = flag;
+}
+}
diff --git a/ChannelDiff/iOS/mrgameios/xlua/libxlua.a b/ChannelDiff/iOS/mrgameios/xlua/libxlua.a
new file mode 100644
index 0000000..3404c1b
--- /dev/null
+++ b/ChannelDiff/iOS/mrgameios/xlua/libxlua.a
Binary files differ
diff --git a/ChannelDiff/iOS/spyxxzios/xlua/HotfixFlags.cpp b/ChannelDiff/iOS/spyxxzios/xlua/HotfixFlags.cpp
new file mode 100644
index 0000000..6451497
--- /dev/null
+++ b/ChannelDiff/iOS/spyxxzios/xlua/HotfixFlags.cpp
@@ -0,0 +1,37 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+int* xlua_hotfix_flags = NULL;
+int xlua_hotfix_flags_len = 0;
+
+extern "C" {
+
+int xlua_get_hotfix_flag(int idx) {
+	if (idx >= xlua_hotfix_flags_len) {
+		return 0;
+	} else {
+		return xlua_hotfix_flags[idx];
+	}
+}
+
+void xlua_set_hotfix_flag(int idx, int flag) {
+	int i = 0;
+        int* new_hotfix_flags = NULL;
+	if (idx >= xlua_hotfix_flags_len) {
+		if (xlua_hotfix_flags == NULL) {
+			xlua_hotfix_flags = (int*)malloc((idx + 1) * sizeof(int));
+		} else {
+			new_hotfix_flags = (int*)realloc(xlua_hotfix_flags, (idx + 1) * sizeof(int));
+                        if (NULL == new_hotfix_flags) { // just skip operation
+                            return;
+                        }
+                        xlua_hotfix_flags = new_hotfix_flags;
+		}
+		for(i = xlua_hotfix_flags_len; i < (idx + 1); i++) {
+			xlua_hotfix_flags[i] = 0;
+		}
+                xlua_hotfix_flags_len = idx + 1;
+	} 
+	xlua_hotfix_flags[idx] = flag;
+}
+}
diff --git a/ChannelDiff/iOS/spyxxzios/xlua/libxlua.a b/ChannelDiff/iOS/spyxxzios/xlua/libxlua.a
new file mode 100644
index 0000000..3404c1b
--- /dev/null
+++ b/ChannelDiff/iOS/spyxxzios/xlua/libxlua.a
Binary files differ

--
Gitblit v1.8.0