From cc547336e235bd4ff5073daceb043e0923aa0ff9 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 03 二月 2024 20:05:00 +0800
Subject: [PATCH] Merge branch 'hyyngame' of http://mobile.secondworld.net.cn:10010/r/snxxz_client into hyyngame

---
 Assets/Editor/Keystore/ald_game.keystore      |    0 
 Assets/Editor/VersionConfigs/Versions.txt     |    6 +++---
 Assets/Editor/Logo/hyyngame/Icon.png          |    0 
 Assets/Editor/Keystore/ald_game.keystore.meta |    7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Assets/Editor/Keystore/ald_game.keystore b/Assets/Editor/Keystore/ald_game.keystore
new file mode 100644
index 0000000..746c121
--- /dev/null
+++ b/Assets/Editor/Keystore/ald_game.keystore
Binary files differ
diff --git a/Assets/Editor/Keystore/ald_game.keystore.meta b/Assets/Editor/Keystore/ald_game.keystore.meta
new file mode 100644
index 0000000..5c24651
--- /dev/null
+++ b/Assets/Editor/Keystore/ald_game.keystore.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4dfc802eca918374bbb2c9be060189fd
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/Logo/hyyngame/Icon.png b/Assets/Editor/Logo/hyyngame/Icon.png
index 3ef4c34..210b5bd 100644
--- a/Assets/Editor/Logo/hyyngame/Icon.png
+++ b/Assets/Editor/Logo/hyyngame/Icon.png
Binary files differ
diff --git a/Assets/Editor/VersionConfigs/Versions.txt b/Assets/Editor/VersionConfigs/Versions.txt
index b643414..d911c14 100644
--- a/Assets/Editor/VersionConfigs/Versions.txt
+++ b/Assets/Editor/VersionConfigs/Versions.txt
@@ -1,6 +1,6 @@
 锘縄d	name	AppId	VersionAuthority	m_Version	m_ClientPackageFlag	m_Branch	m_GameId	m_AssetAccess	m_PartAssetPackage	m_ProductName	m_BundleIdentifier	m_KeystoreFileName	m_KeystorePassword	m_KeystoreAlias	m_KeystoreAliasPassword	m_AppleDeveloperTeamID	m_DebugVersion	m_IsBanShu	m_LogoPosition	m_BanHao	m_SpID	m_Recharge	m_CreateRolePattern	SdkFileName
 鐗堟湰鏍囪瘑	鐗堟湰鍚嶇О	娓犻亾id	鐗堟湰鏉冮檺锛�0鏄祴璇曠増鏈紝1鏄彂甯冪増鏈�	鐗堟湰鍙�	瀹㈡埛绔爣璇�	鍒嗘敮	娓告垙椤圭洰鏍囪瘑	璧勬簮,0NullAsset,1HalfAsset,2FullAsset,3IgnoreDownLoad	鏄惁鍒嗗寘锛�0涓嶅垎鍖咃紝1鍒嗗寘	浜у搧鍚�	浜у搧鍖呭悕	绛惧悕鏂囦欢鍚�	绛惧悕鏂囦欢瀵嗙爜	绛惧悕鏂囦欢鍒悕	绛惧悕鏂囦欢鍒悕瀵嗙爜	寮�鍙戣�呰处鍙峰瘑鐮�	鏄惁debug鐗堟湰锛�0鍚�1鏄�	鏄惁鐗堢讲鐗堟湰锛�0鍚�1鏄�	鐧诲綍鐣岄潰鐨凩ogo浣嶇疆	鐗堝彿	杩愯惀鍟咺D	鍏呭�肩晫闈㈤鏍�	鍒涜鍦烘櫙椋庢牸	sdk鐩綍鍒悕
 9999	TheSecondWorld	test	0	2.0.600	2021	2	xbqy	1	1	浠欏疂濂囩紭	com.secondworld.snxxz	thesecondworld	thesecondworld2018	thesecondworld	thesecondworld2018		0	0	(-32,144)			0		
-10000	TheSecondWorld	test	0	1.101.1	2021	900	xbqy	1	1	浠欏疂濂囩紭	com.secondworld.snxxz	thesecondworld	thesecondworld2018	thesecondworld	thesecondworld2018		0	0	(-32,144)			0		
-1	hyyngame	hyyngame	1	1.101.1	2021	1	xbqy	1	1	Tru Ti锚n Quy岷縯	com.djmxyn.gp	hyyngame	aldgame688	ald_alias	aldgame688		0	0	(0,144)	1	hyyngame	0		
-2	hyyngame	hyyngame	1	1.101.1	2021	3	xbqy	1	1	Tru Ti锚n Quy岷縯	com.djmxyn.gp	hyyngame	aldgame688	ald_alias	aldgame688		0	0	(0,144)	1	hyyngame	0		
\ No newline at end of file
+10000	TheSecondWorld	test	0	1.105.1	2021	900	xbqy	1	1	浠欏疂濂囩紭	com.secondworld.snxxz	thesecondworld	thesecondworld2018	thesecondworld	thesecondworld2018		0	0	(-32,144)			0		
+1	hyyngame	hyyngame	1	1.105.1	2021	1	xbqy	1	1	Tru Ti锚n Quy岷縯	com.djmxyn.gp	ald_game	aldgame688	ald_alias	aldgame688		0	0	(0,144)	1	hyyngame	0		
+2	hyyngame	hyyngame	1	1.105.1	2021	3	xbqy	1	1	Tru Ti锚n Quy岷縯	com.djmxyn.gp	ald_game	aldgame688	ald_alias	aldgame688		0	0	(0,144)	1	hyyngame	0		
\ No newline at end of file

--
Gitblit v1.8.0