diff --git a/Assets/LuaFramework/GameIcon/app_icon.png b/Assets/LuaFramework/GameIcon/app_icon.png
index 973c5485cc..6b8dec79c2 100644
Binary files a/Assets/LuaFramework/GameIcon/app_icon.png and b/Assets/LuaFramework/GameIcon/app_icon.png differ
diff --git a/Assets/LuaFramework/Scenes/LogoYuenanTishen.unity b/Assets/LuaFramework/Scenes/LogoYuenanTishen.unity
index 036644aaf1..0b56dfa4d6 100644
--- a/Assets/LuaFramework/Scenes/LogoYuenanTishen.unity
+++ b/Assets/LuaFramework/Scenes/LogoYuenanTishen.unity
@@ -275,8 +275,8 @@ MonoBehaviour:
isDebug: 0
bundleMode: 1
luaBundleMode: 1
- isUpdate: 0
+ isUpdate: 1
isSDK: 1
isSDKLogin: 1
isGuide: 1
- isOpenGM: 1
+ isOpenGM: 0
diff --git a/Assets/LuaFramework/Scenes/Logo_cn_caohua.unity b/Assets/LuaFramework/Scenes/Logo_cn_caohua.unity
index 6757fe0224..e8f56b6fea 100644
--- a/Assets/LuaFramework/Scenes/Logo_cn_caohua.unity
+++ b/Assets/LuaFramework/Scenes/Logo_cn_caohua.unity
@@ -275,7 +275,7 @@ MonoBehaviour:
isDebug: 0
bundleMode: 1
luaBundleMode: 1
- isUpdate: 1
+ isUpdate: 0
isSDK: 1
isSDKLogin: 1
isGuide: 1
diff --git a/Assets/LuaFramework/Scripts/Framework/App.cs b/Assets/LuaFramework/Scripts/Framework/App.cs
index da609c0586..730009b154 100644
--- a/Assets/LuaFramework/Scripts/Framework/App.cs
+++ b/Assets/LuaFramework/Scripts/Framework/App.cs
@@ -6,6 +6,8 @@ using GameCore;
using ResMgr;
using GameLogic;
using ResourcesManager = GameLogic.ResourcesManager;
+using SDK;
+using UnityEngine.SocialPlatforms;
///
/// 游戏入口
@@ -205,8 +207,23 @@ public class App : UnitySingleton
yield return ConfigMgr.Init();
yield return VersionMgr.Initialize();
SLanguageMoreLanguageMgr.Instance.InitData();
+#if !UNITY_EDITOR
+ //while (!isLoginSuccess)
+ //{
+ // yield return null;
+ //}
+#endif
+ }
+ private bool isLoginSuccess;
+ public void LoginCallback(string data)
+ {
+ string[] result = data.Split('#');
+ if (result[0]=="1")
+ {
+ isLoginSuccess = true;
+ Debug.LogError("登陆成功!!!!!!!!!!!!!!");
+ }
}
-
///
/// 启动框架
///
diff --git a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs
index ae83544ac8..0ffd26cdf1 100644
--- a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs
+++ b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs
@@ -15,6 +15,7 @@ namespace SDK
{
public class SDKManager : UnitySingleton
{
+ public bool IsLogin { get; private set; }
public delegate void InitLaunchAction(string data);
public InitLaunchAction onInitLaunchCallback;
@@ -234,6 +235,7 @@ namespace SDK
msgId = MessageDef.MSG_InitCallback,
data = data
});
+ IsLogin = true;
}
//sdk 注册 回调
public void RegisterCallback(string data)
diff --git a/Assets/ManagedResources/ArtFont_en/icon_chenghao35_en.png.meta b/Assets/ManagedResources/ArtFont_en/icon_chenghao35_en.png.meta
index ab7e9d5805..d003327e52 100644
--- a/Assets/ManagedResources/ArtFont_en/icon_chenghao35_en.png.meta
+++ b/Assets/ManagedResources/ArtFont_en/icon_chenghao35_en.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 26f9b7eb2147c4528a1c5f0755c19620
+guid: 3146628752e74d84485abccbc7821ccc
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@@ -86,7 +86,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID: 0ff14cd1450ba494096eda1c8eff0737
+ spriteID: bc31c74d97d4baf49b10480e70c5a9b6
vertices: []
indices:
edges: []
diff --git a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_dongtian_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_dongtian_en.png.meta
index b81bfa7b9b..cae7c4cf4d 100644
--- a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_dongtian_en.png.meta
+++ b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_dongtian_en.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: ed1a0e5afcddc43979214abe9272c369
+guid: 071c91f757b00bb4d8469c3bb8453c44
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@@ -86,7 +86,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID: c78472d8183bb48eeaed4ac99540642b
+ spriteID: 6b40770e24477424c82934dbc181a80d
vertices: []
indices:
edges: []
diff --git a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_fudi_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_fudi_en.png.meta
index bdfbea72f3..bf3e2d0c17 100644
--- a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_fudi_en.png.meta
+++ b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_fudi_en.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 6e50f4c216efa44c1830ed5a4a04a9ec
+guid: 28a8a66b3cef33b4f926b4109fc805bf
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@@ -86,7 +86,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID: 9ad6bbaf53bf3496d861f6608d3f9c9a
+ spriteID: aee94d6992f8541469a9e762d742db14
vertices: []
indices:
edges: []
diff --git a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_luofu_en.png.meta b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_luofu_en.png.meta
index cd080b0cbb..cc02922b2c 100644
--- a/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_luofu_en.png.meta
+++ b/Assets/ManagedResources/ArtFont_en/r_Resource_Coin_luofu_en.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 7b5e59642605a42ab8031837e113e8b7
+guid: 07c7253b24bb5204e9ecce974a0ff8a3
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@@ -86,7 +86,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID: 321a95217aa2f4fcebfaeeb443681dd0
+ spriteID: 157aaaeb2ee461a43a467ce8c01d334c
vertices: []
indices:
edges: []
diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
index cf96092a25..8bb83a804c 100644
--- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
+++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
@@ -5605,51 +5605,51 @@ MonoBehaviour:
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianhongzi1_en
+ - resName: f_fabaojuling_zhujiemianhongzi1_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianhongzi2_en
+ - resName: f_fabaojuling_zhujiemianhongzi2_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianhongzi3_en
+ - resName: f_fabaojuling_zhujiemianhongzi3_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianhongzi4_en
+ - resName: f_fabaojuling_zhujiemianhongzi4_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianhongzi5_en
+ - resName: f_fabaojuling_zhujiemianhongzi5_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianhongzi6_en
+ - resName: f_fabaojuling_zhujiemianhongzi6_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianhongzi7_en
+ - resName: f_fabaojuling_zhujiemianhongzi7_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianhongzi9_en
+ - resName: f_fabaojuling_zhujiemianhongzi9_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianjinzi1_en
+ - resName: f_fabaojuling_zhujiemianjinzi1_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianjinzi2_en
+ - resName: f_fabaojuling_zhujiemianjinzi2_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianjinzi3_en
+ - resName: f_fabaojuling_zhujiemianjinzi3_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: f_fabaojuling_enujiemianjinzi4_en
+ - resName: f_fabaojuling_zhujiemianjinzi4_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
@@ -5981,6 +5981,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 1
resAbNameIndex: 0
+ - resName: icon_chenghao35_en
+ extension: .png
+ resPathIndex: 1
+ resAbNameIndex: 0
- resName: icon_chenghao3_en
extension: .png
resPathIndex: 1
@@ -8013,6 +8017,18 @@ MonoBehaviour:
extension: .png
resPathIndex: 1
resAbNameIndex: 0
+ - resName: r_Resource_Coin_dongtian_en
+ extension: .png
+ resPathIndex: 1
+ resAbNameIndex: 0
+ - resName: r_Resource_Coin_fudi_en
+ extension: .png
+ resPathIndex: 1
+ resAbNameIndex: 0
+ - resName: r_Resource_Coin_luofu_en
+ extension: .png
+ resPathIndex: 1
+ resAbNameIndex: 0
- resName: r_Resource_dongtian_en
extension: .png
resPathIndex: 1
@@ -11193,7 +11209,7 @@ MonoBehaviour:
extension: .png
resPathIndex: 1
resAbNameIndex: 0
- - resName: z_icon_bianshenka_enenyingtubiao_en
+ - resName: z_icon_bianshenka_zhenyingtubiao_en
extension: .png
resPathIndex: 1
resAbNameIndex: 0
@@ -11381,6 +11397,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 1
resAbNameIndex: 0
+ - resName: z_zhandou_nuqijian_en
+ extension: .png
+ resPathIndex: 1
+ resAbNameIndex: 0
- resName: z_zhandou_nuqijia_en
extension: .png
resPathIndex: 1
@@ -12617,6 +12637,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 2
resAbNameIndex: 1
+ - resName: icon_chenghao35_vi
+ extension: .png
+ resPathIndex: 2
+ resAbNameIndex: 1
- resName: icon_chenghao3_vi
extension: .png
resPathIndex: 2
@@ -14065,6 +14089,18 @@ MonoBehaviour:
extension: .png
resPathIndex: 2
resAbNameIndex: 1
+ - resName: r_Resource_Coin_dongtian_vi
+ extension: .png
+ resPathIndex: 2
+ resAbNameIndex: 1
+ - resName: r_Resource_Coin_fudi_vi
+ extension: .png
+ resPathIndex: 2
+ resAbNameIndex: 1
+ - resName: r_Resource_Coin_luofu_vi
+ extension: .png
+ resPathIndex: 2
+ resAbNameIndex: 1
- resName: r_Resource_dongtian_vi
extension: .png
resPathIndex: 2
@@ -55513,7 +55549,7 @@ MonoBehaviour:
extension: .png
resPathIndex: 648
resAbNameIndex: 2397
- - resName: icon_chenghao35
+ - resName: icon_chenghao35_zh
extension: .png
resPathIndex: 648
resAbNameIndex: 2397
@@ -97310,6 +97346,7 @@ MonoBehaviour:
- lz4/publicartres/models.unity3d
- assetBundleName: lz4/prefabs/ui/guild.unity3d
dependences:
+ - lz4/atlas/activityaltas.unity3d
- lz4/atlas/bishuzi.unity3d
- lz4/atlas/flyupatlas.unity3d
- lz4/atlas/gmaltas.unity3d
@@ -99245,7 +99282,6 @@ MonoBehaviour:
- lz4/dynamicatlas/commonatlas/s_shangcheng_hunjing_01.unity3d
- lz4/dynamicatlas/commonatlas/s_shop_biaoti.unity3d
- lz4/dynamicatlas/commonatlas/s_shop_dikuangyinying.unity3d
- - lz4/dynamicatlas/commonatlas/s_shop_xiangou.unity3d
- lz4/dynamicatlas/r_guanka_guankajiangliyaojin_png.unity3d
- lz4/dynamicatlas/r_lianzao_duihuakuang.unity3d
- lz4/dynamicatlas/s_qihun_kuangzhezhao.unity3d
diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua
index 534ea6df89..f26858e740 100644
--- a/Assets/ManagedResources/~Lua/Common/functions.lua
+++ b/Assets/ManagedResources/~Lua/Common/functions.lua
@@ -2235,10 +2235,16 @@ function SubmitExtraData(context)
end
local params = SDK.SDKSubmitExtraDataArgs.New()
params.dataType = context.type
- params.serverID = tonumber(PlayerManager.serverInfo.server_id)
- params.serverName = PlayerManager.serverInfo.name
+ if PlayerManager.serverInfo then
+ params.serverID = tonumber(PlayerManager.serverInfo.server_id)
+ params.serverName = PlayerManager.serverInfo.name
+ params.zoneName = PlayerManager.serverInfo.name
+ else
+ params.serverID = tonumber(1)
+ params.serverName = ""
+ params.zoneName = ""
+ end
params.zoneID = tostring(AppConst.OpenId)
- params.zoneName = PlayerManager.serverInfo.name
params.roleID = tostring(PlayerManager.uid)
params.roleName = PlayerManager.nickName
params.roleLevel = tostring(PlayerManager.level)
diff --git a/Assets/ManagedResources/~Lua/Logic/Game.lua b/Assets/ManagedResources/~Lua/Logic/Game.lua
index 3066d0a5af..7f59d3182d 100644
--- a/Assets/ManagedResources/~Lua/Logic/Game.lua
+++ b/Assets/ManagedResources/~Lua/Logic/Game.lua
@@ -82,9 +82,9 @@ end
--应用程序暂停/恢复
function Game.OnApplicationPause(pauseStatus)
LogError("Game.OnApplicationPause:" .. tostring(pauseStatus))
- if pauseStatus == true then
+ if pauseStatus == true and LoginManager.IsLogin then
LogError("11111111111111111111111111111111111111111111111111111111111111111")
- --SubmitExtraData({ type = SDKSubMitType.TYPE_PLAYTIME , roleLevelUpTime = time })
+ SubmitExtraData({ type = SDKSubMitType.TYPE_PLAYTIME , roleLevelUpTime = time })
time = Time.time
end
end
@@ -96,7 +96,7 @@ function Game.OnApplicationFocus(hasFocus)
LogError("222222222222222222222222222222222222")
--Game.GlobalEvent:DispatchEvent(Protocal.Exception, self)
time = Time.time
- else
+ elseif LoginManager.IsLogin then
SubmitExtraData({ type = SDKSubMitType.TYPE_PLAYTIME, roleLevelUpTime = tostring(Time.time - time) })
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
index 3a244197ed..694ca74374 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
@@ -20,7 +20,7 @@ local LoginRoot_Channel = ServerConfigManager.GetVersionInfo("channel")
local LoginRoot_Version = ServerConfigManager.GetVersionInfo("version")
local LoginRoot_PackageVersion = ServerConfigManager.GetVersionInfo("packageVersion")
local LoginRoot_NoticeChannel = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.NOTICE_CHANNEL) or
-""
+ ""
local LoginRoot_UserChannel = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.USER_CHANNEL) or ""
local orginLayer
@@ -182,7 +182,7 @@ function this:BindEvent()
LoginManager.state = list.state
--local severArea = tonumber(string.sub(list.server_id, 0, -5))
this.serverMes.text = PlayerManager.serverInfo
- .name -- .. "\t" .. severArea .. "" .. Language[11713]
+ .name -- .. "\t" .. severArea .. "" .. Language[11713]
end
})
end)
@@ -390,7 +390,7 @@ function this.ShowNotice()
end
end
local url = LoginRoot_Url ..
- "jl_loginserver/getNotice?timestamp=" .. timeStamp .. "&sign=" .. timeSign .. "&packageName=" .. noticeChannel
+ "jl_loginserver/getNotice?timestamp=" .. timeStamp .. "&sign=" .. timeSign .. "&packageName=" .. noticeChannel
HttpManager:SendGetHttp(url, function(str)
UIManager.OpenPanel(UIName.NoticePopup, str)
end, nil, nil, nil)
@@ -441,6 +441,7 @@ function this.RequestServerList(userId, callback)
local url = string.format(
"%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s&server_version=%s",
LoginRoot_Url, userId, LoginRoot_Channel, LoginRoot_SubChannel, SERVER_VERSION)
+ LogError("获取服务器列表url:" .. url)
SubmitExtraData({ type = SDKSubMitType.TYPE_GETSERVERLIST })
HttpManager:SendGetHttp(url, callback, nil, nil, nil)
end)
@@ -639,7 +640,7 @@ function this.SetServerList(data)
--local severArea = tonumber(string.sub(this.serverList[lastIndex].server_id, 0, -5))
this.serverMes.text = PlayerManager.serverInfo
- .name -- .. "\t" .. severArea .. "" .. Language[11713]
+ .name -- .. "\t" .. severArea .. "" .. Language[11713]
RequestPanel.Hide()
end
@@ -672,78 +673,80 @@ end
--登录进主界面之前需要依次请求玩家数据,物品数据,装备数据,英雄数据,编队数据,任务数据, 异妖数据,工坊数据, 冒险数据
function this.ExecuteLoading()
local requestList = {
- --[[[1] = ]] function() NetManager.PlayerInfoRequest(LoadingPanel.OnStep) end, -- 基础信息
- --[[[2] = ]] function() NetManager.GetComparenumInfoRequest(LoadingPanel.OnStep) end, -- 数字游戏信息
- --[[[2] = ]] function() NetManager.RequestMission(LoadingPanel.OnStep) end, -- 任务信息
- --[[[3] = ]] function() NetManager.ItemInfoRequest(0, LoadingPanel.OnStep) end, -- 物品信息
- --[[[4]=]] function() NetManager.CrossServerStatusRequest(LoadingPanel.OnStep) end, -- 装备(走背包了)
- --[[[5] = ]] function() NetManager.AllEquipTreasureRequest(0, LoadingPanel.OnStep) end, -- 宝物
+ --[[[1] = ]] function() NetManager.PlayerInfoRequest(LoadingPanel.OnStep) end, -- 基础信息
+ --[[[2] = ]] function() NetManager.GetComparenumInfoRequest(LoadingPanel.OnStep) end, -- 数字游戏信息
+ --[[[2] = ]] function() NetManager.RequestMission(LoadingPanel.OnStep) end, -- 任务信息
+ --[[[3] = ]] function() NetManager.ItemInfoRequest(0, LoadingPanel.OnStep) end, -- 物品信息
+ --[[[4]=]] function() NetManager.CrossServerStatusRequest(LoadingPanel.OnStep) end, -- 装备(走背包了)
+ --[[[5] = ]] function() NetManager.AllEquipTreasureRequest(0, LoadingPanel.OnStep) end, -- 宝物
-- [[[6] = ]]function() NetManager.GetSoulPrintDataRequest(0, LoadingPanel.OnStep) end, -- 魂印(走背包了)
- --[[[5] = ]] function() NetManager.GetAllFaXiangRequest(1, LoadingPanel.OnStep) end, -- 法相
- --[[[6] =]] function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, --天枢密卷
- --[[[7] = ]] function() NetManager.DiffMonsterRequest(0, LoadingPanel.OnStep) end, -- 异妖
- --[[[8] = ]] function() NetManager.HeroInfoRequest(0, LoadingPanel.OnStep) end, -- 神将信息
- --[[[9] = ]] function() NetManager.TeamInfoRequest(LoadingPanel.OnStep) end, -- 编队
- --[[[10] =]] function() NetManager.GetAllMailData(LoadingPanel.OnStep) end, -- 邮件
- --[[[11] =]] function() NetManager.GetAllFightDataRequest(LoadingPanel.OnStep) end, -- 关卡信息
- --[[[12] =]] function() NetManager.GetActivityAllRewardRequest(LoadingPanel.OnStep) end, -- 活动奖励
- --[[[13] =]] --function() NetManager.RequestBaseArenaData(LoadingPanel.OnStep) end, -- 竞技场
- --[[[14] =]] function() ShopManager.InitData(LoadingPanel.OnStep) end, -- 商店
+ --[[[5] = ]] function() NetManager.GetAllFaXiangRequest(1, LoadingPanel.OnStep) end, -- 法相
+ --[[[6] =]] function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, --天枢密卷
+ --[[[7] = ]] function() NetManager.DiffMonsterRequest(0, LoadingPanel.OnStep) end, -- 异妖
+ --[[[8] = ]] function() NetManager.HeroInfoRequest(0, LoadingPanel.OnStep) end, -- 神将信息
+ --[[[9] = ]] function() NetManager.TeamInfoRequest(LoadingPanel.OnStep) end, -- 编队
+ --[[[10] =]] function() NetManager.GetAllMailData(LoadingPanel.OnStep) end, -- 邮件
+ --[[[11] =]] function() NetManager.GetAllFightDataRequest(LoadingPanel.OnStep) end, -- 关卡信息
+ --[[[12] =]] function() NetManager.GetActivityAllRewardRequest(LoadingPanel.OnStep) end, -- 活动奖励
+ --[[[13] =]] --function() NetManager.RequestBaseArenaData(LoadingPanel.OnStep) end, -- 竞技场
+ --[[[14] =]] function() ShopManager.InitData(LoadingPanel.OnStep) end, -- 商店
--function() NetManager.GetWorkShopInfoRequest(LoadingPanel.OnStep) end, -- 工坊?
- --[[[15] =]] function() ChatManager.InitData(LoadingPanel.OnStep) end, -- 聊天
- --[[[16] =]] function() NetManager.GetAllFunState(LoadingPanel.OnStep) end, -- 功能开启信息
- --[[[17] =]] function() NetManager.RequestGetFriendInfo(1, LoadingPanel.OnStep) end, -- 好友
- --[[[18] =]] function() NetManager.RequestGetFriendInfo(2, LoadingPanel.OnStep) end, -- 好友申请
- --[[[19] =]] function() NetManager.RequestGetFriendInfo(3, LoadingPanel.OnStep) end, -- 好友搜索
- --[[[20] =]] function() NetManager.RequestGetFriendInfo(4, LoadingPanel.OnStep) end, -- 黑名单
- --[[[21] =]] function() FriendChatManager.InitData(LoadingPanel.OnStep) end, -- 好友消息
- --[[[22] =]] function() MyGuildManager.InitBaseData(LoadingPanel.OnStep) end, -- 公会信息
+ --[[[15] =]] function() ChatManager.InitData(LoadingPanel.OnStep) end, -- 聊天
+ --[[[16] =]] function() NetManager.GetAllFunState(LoadingPanel.OnStep) end, -- 功能开启信息
+ --[[[17] =]] function() NetManager.RequestGetFriendInfo(1, LoadingPanel.OnStep) end, -- 好友
+ --[[[18] =]] function() NetManager.RequestGetFriendInfo(2, LoadingPanel.OnStep) end, -- 好友申请
+ --[[[19] =]] function() NetManager.RequestGetFriendInfo(3, LoadingPanel.OnStep) end, -- 好友搜索
+ --[[[20] =]] function() NetManager.RequestGetFriendInfo(4, LoadingPanel.OnStep) end, -- 黑名单
+ --[[[21] =]] function() FriendChatManager.InitData(LoadingPanel.OnStep) end, -- 好友消息
+ --[[[22] =]] function() MyGuildManager.InitBaseData(LoadingPanel.OnStep) end, -- 公会信息
--function() GuildFightManager.InitBaseData(LoadingPanel.OnStep) end, -- 公会战
- --[[[23] =]] function() NetManager.GetAllGuildSkillData(LoadingPanel.OnStep) end, -- 公会技能
- --[[[24] =]] function() NetManager.InitFightPointLevelInfo(LoadingPanel.OnStep) end, -- 关卡
+ --[[[23] =]] function() NetManager.GetAllGuildSkillData(LoadingPanel.OnStep) end, -- 公会技能
+ --[[[24] =]] function() NetManager.InitFightPointLevelInfo(LoadingPanel.OnStep) end, -- 关卡
--[[[25] =]] function() NetManager.GetExpeditionRequest(ExpeditionManager.expeditionLeve, LoadingPanel.OnStep) end, -- 大闹天宫
- --[[[26] =]] function() NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep) end, -- 公会援助
- --[[[27] =]] function() DeathPosManager.InitData(LoadingPanel.OnStep) end, -- 十绝阵
- --[[[28] =]] function() NetManager.TreasureOfHeavenScoreRequest(LoadingPanel.OnStep) end, -- 天宫秘宝积分
- --[[[29] =]] function() NetManager.RankFirstRequest({ 3, 22, 20, 4, 21 }, { 0, 0, 0, 0, 20 }, LoadingPanel
- .OnStep) end, -- 排行榜数据
- --[[[30] =]] function() NetManager.GetSituationInfoRequest(LoadingPanel.OnStep) end, --轩辕宝镜
- --[[[31] =]] function() NetManager.RefreshTimeSLRequest(LoadingPanel.OnStep) end, --青龙秘宝倒计时
- --[[[32] =]] function() HeroManager.CheckRepeatTreasure(LoadingPanel.OnStep) end, --检测所有重复穿戴的宝器并卸下
- --[[[33] =]] function() XiaoYaoManager.GetOpenMapData(LoadingPanel.OnStep) end, --逍遥游
- --[[[34] =]] function() NetManager.GetHeroSkinData(LoadingPanel.OnStep) end, --皮肤
- --[[[35] =]] function() NetManager.GetFourElementGetInfo(LoadingPanel.OnStep) end, --四灵试炼
- --[[[35] =]] function() NetManager.GetChallengeCopyInfo(LoadingPanel.OnStep) end, --挑战副本
- --[[[36] =]] function() MonsterCampManager.SetMyHelpHeroData(nil, nil, LoadingPanel.OnStep) end, --助战神将
- --[[[37] =]] function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, --鸿蒙阵
+ --[[[26] =]] function() NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep) end, -- 公会援助
+ --[[[27] =]] function() DeathPosManager.InitData(LoadingPanel.OnStep) end, -- 十绝阵
+ --[[[28] =]] function() NetManager.TreasureOfHeavenScoreRequest(LoadingPanel.OnStep) end, -- 天宫秘宝积分
+ --[[[29] =]] function()
+ NetManager.RankFirstRequest({ 3, 22, 20, 4, 21 }, { 0, 0, 0, 0, 20 }, LoadingPanel
+ .OnStep)
+ end, -- 排行榜数据
+ --[[[30] =]] function() NetManager.GetSituationInfoRequest(LoadingPanel.OnStep) end, --轩辕宝镜
+ --[[[31] =]] function() NetManager.RefreshTimeSLRequest(LoadingPanel.OnStep) end, --青龙秘宝倒计时
+ --[[[32] =]] function() HeroManager.CheckRepeatTreasure(LoadingPanel.OnStep) end, --检测所有重复穿戴的宝器并卸下
+ --[[[33] =]] function() XiaoYaoManager.GetOpenMapData(LoadingPanel.OnStep) end, --逍遥游
+ --[[[34] =]] function() NetManager.GetHeroSkinData(LoadingPanel.OnStep) end, --皮肤
+ --[[[35] =]] function() NetManager.GetFourElementGetInfo(LoadingPanel.OnStep) end, --四灵试炼
+ --[[[35] =]] function() NetManager.GetChallengeCopyInfo(LoadingPanel.OnStep) end, --挑战副本
+ --[[[36] =]] function() MonsterCampManager.SetMyHelpHeroData(nil, nil, LoadingPanel.OnStep) end, --助战神将
+ --[[[37] =]] function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, --鸿蒙阵
--[--[[38] =]]function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, --天枢密卷
- --[[[39] =]] function() NetManager.AllEndLessHeroDataResponse(0, LoadingPanel.OnStep) end, --无尽英雄数据
- --[[[40] =]] function() NetManager.GetEndlessTreasureInfoResponse(LoadingPanel.OnStep) end, --无尽密保
- --[[[41] =]] function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end, --请求红包
- --[[[42] =]] function() NetManager.HardStageRequest(LoadingPanel.OnStep) end, --山河社稷图
- --[[[43] =]] function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end, --vip
- --[[[44] =]] function() NetManager.RequestRedPacketData(LoadingPanel.OnStep) end, --福利红包
- --[[[45] =]] function() NetManager.BeautyBagWishEquipRequest(nil, LoadingPanel.OnStep) end, --心愿魂印
- --[[[46] =]] function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜
- --[[[47] =]] function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end, --跨服
- --[[[48] =]] function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end, --太初密卷
- --[[[49] =]] function() NetManager.CrossYuXuLunDaoGetInfoRequest(2, LoadingPanel.OnStep) end, --玉虚论道红点
- --[[[50] =]] function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度
- --[[[51] =]] function() NetManager.GetTransformationRequest(LoadingPanel.OnStep) end, --身外化身
- --[[[52] =]] function() NetManager.GetLingMaiInfoRequest(0, LoadingPanel.OnStep) end, --灵脉秘境
- --[[[53] =]] function() NetManager.SendGetTailsmanSoulData(LoadingPanel.OnStep) end, --法宝之灵
- --[[[54] =]] --function() NetManager.RequestArenaRankData(1,LoadingPanel.OnStep) end, --获取竞技场数据
- --[[[55] =]] function() HomeLandManager.GetData(LoadingPanel.OnStep) end, --家园获取数据
- --[[[56] =]] function() NetManager.ExplorerMapInfoRequest(LoadingPanel.OnStep) end, --灵脉秘境
- --[[[57] =]] function() CommonActPageManager.GetPowerRicePower(LoadingPanel.OnStep) end, --战力冲刺
- --[[[58] =]] function() NetManager.RequestMagicSoldierInfo(LoadingPanel.OnStep) end, --神兵
- --[[[59] =]] function() NetManager.GemNewInfoRequest(LoadingPanel.OnStep) end, --新命石
- --[[[60] =]] function() NetManager.BaublesAllInfoRequest(LoadingPanel.OnStep) end, --新法宝
- --[[[61] =]] function() NetManager.TrainingArchitectureInfoRequest(LoadingPanel.OnStep) end, --特训信息
- --[[[62] =]] function() NetManager.NewArenaResetRequest(LoadingPanel.OnStep) end, -- 竞技场
- --[[[63] =]] function() NetManager.GetNewArenaInfoRequest(LoadingPanel.OnStep) end, -- 竞技场
- --[[[64] =]] function() NetManager.GetSoldiersInfoRequest(LoadingPanel.OnStep) end, --小兵
- --[[[65] =]] function() NetManager.BaublesAllInfoRequest(LoadingPanel.OnStep) end, --新法宝
+ --[[[39] =]] function() NetManager.AllEndLessHeroDataResponse(0, LoadingPanel.OnStep) end, --无尽英雄数据
+ --[[[40] =]] function() NetManager.GetEndlessTreasureInfoResponse(LoadingPanel.OnStep) end, --无尽密保
+ --[[[41] =]] function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end, --请求红包
+ --[[[42] =]] function() NetManager.HardStageRequest(LoadingPanel.OnStep) end, --山河社稷图
+ --[[[43] =]] function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end, --vip
+ --[[[44] =]] function() NetManager.RequestRedPacketData(LoadingPanel.OnStep) end, --福利红包
+ --[[[45] =]] function() NetManager.BeautyBagWishEquipRequest(nil, LoadingPanel.OnStep) end, --心愿魂印
+ --[[[46] =]] function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜
+ --[[[47] =]] function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end, --跨服
+ --[[[48] =]] function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end, --太初密卷
+ --[[[49] =]] function() NetManager.CrossYuXuLunDaoGetInfoRequest(2, LoadingPanel.OnStep) end, --玉虚论道红点
+ --[[[50] =]] function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度
+ --[[[51] =]] function() NetManager.GetTransformationRequest(LoadingPanel.OnStep) end, --身外化身
+ --[[[52] =]] function() NetManager.GetLingMaiInfoRequest(0, LoadingPanel.OnStep) end, --灵脉秘境
+ --[[[53] =]] function() NetManager.SendGetTailsmanSoulData(LoadingPanel.OnStep) end, --法宝之灵
+ --[[[54] =]] --function() NetManager.RequestArenaRankData(1,LoadingPanel.OnStep) end, --获取竞技场数据
+ --[[[55] =]] function() HomeLandManager.GetData(LoadingPanel.OnStep) end, --家园获取数据
+ --[[[56] =]] function() NetManager.ExplorerMapInfoRequest(LoadingPanel.OnStep) end, --灵脉秘境
+ --[[[57] =]] function() CommonActPageManager.GetPowerRicePower(LoadingPanel.OnStep) end, --战力冲刺
+ --[[[58] =]] function() NetManager.RequestMagicSoldierInfo(LoadingPanel.OnStep) end, --神兵
+ --[[[59] =]] function() NetManager.GemNewInfoRequest(LoadingPanel.OnStep) end, --新命石
+ --[[[60] =]] function() NetManager.BaublesAllInfoRequest(LoadingPanel.OnStep) end, --新法宝
+ --[[[61] =]] function() NetManager.TrainingArchitectureInfoRequest(LoadingPanel.OnStep) end, --特训信息
+ --[[[62] =]] function() NetManager.NewArenaResetRequest(LoadingPanel.OnStep) end, -- 竞技场
+ --[[[63] =]] function() NetManager.GetNewArenaInfoRequest(LoadingPanel.OnStep) end, -- 竞技场
+ --[[[64] =]] function() NetManager.GetSoldiersInfoRequest(LoadingPanel.OnStep) end, --小兵
+ --[[[65] =]] function() NetManager.BaublesAllInfoRequest(LoadingPanel.OnStep) end, --新法宝
--[[[66] =]] function() NetManager.TrainingArchitectureInfoRequest(LoadingPanel.OnStep) end,
--[[[67] =]] function() NetManager.QueryBookImageRequest(6, LoadingPanel.OnStep) end,
--[[[68] =]] function() NetManager.QueryBookImageRequest(7, LoadingPanel.OnStep) end,
@@ -886,7 +889,7 @@ function this.RequestHttpLogin()
.. "&platform=" .. Platform
.. "&channel=" .. user_channel
.. "&sub_channel=" .. LoginRoot_SubChannel
- .. "&pid=" .. AppConst.SdkChannel --LoginManager.pt_pId
+ .. "&pid=" .. AppConst.SdkChannel --LoginManager.pt_pId
.. "&gid=" .. AppConst.SdkPackageName --LoginManager.pt_gId
.. "&version=" .. LoginRoot_PackageVersion
.. "&timeStamp=" .. LoginManager.SdkLoginTimeStamp
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua b/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua
index b1dfc2355b..638113ce96 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua
@@ -92,6 +92,7 @@ function this.GetNotice(str)
for key, value in pairs(data.list) do
prelist[key]:SetActive(true)
local img = Util.GetGameObject(prelist[key], "Image/img"):GetComponent("Image")
+ --[[
if value.type == 1 then
img.sprite = this.spLoader:LoadSprite("g_gg_zhongyao_zh")
elseif value.type == 2 then
@@ -101,6 +102,8 @@ function this.GetNotice(str)
elseif value.type == 4 then
img.gameObject:SetActive(false)
end
+ ]]
+ img.gameObject:SetActive(false)
-- 表体
local title = Util.GetGameObject(prelist[key], "Image/title"):GetComponent("Text")
local titleStr = string.split(value.title, "|")
diff --git a/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs b/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs
index 38874dc861..34909216cd 100644
--- a/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs
+++ b/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs
@@ -6,6 +6,7 @@ using GameCore;
using System.IO;
using GameLogic;
using UnityEngine.Networking;
+using SDK;
namespace ResUpdate
{
@@ -55,7 +56,7 @@ namespace ResUpdate
///
public float totalSizeKB
{
- get { return 1f *TotalSize / 1024; }
+ get { return 1f * TotalSize / 1024; }
}
///
@@ -201,13 +202,14 @@ namespace ResUpdate
///
public void BeginDownLoad(bool allowDownLoadFromNoWifi)
{
- if (downLoadFiles.Count == 0)
+ if (downLoadFiles.Count == 0)
{
UpdateSuccess();
return;
}
- Action startDownAction = () => {
+ Action startDownAction = () =>
+ {
startTime = DateTime.Now;
progressInfo.Clear();
@@ -222,7 +224,7 @@ namespace ResUpdate
}
else
{
- SetResourcesUpdateState(false, ResourcesUpdateState.DownLoadWithWifi, new object[] { progress.TotalSize, startDownAction });
+ SetResourcesUpdateState(false, ResourcesUpdateState.DownLoadWithWifi, new object[] { progress.TotalSize, startDownAction });
}
}
@@ -245,12 +247,12 @@ namespace ResUpdate
{
this.progress.Size += each;
}
-
+
TimeSpan span = DateTime.Now - startTime;
float second = (float)span.TotalSeconds;
if (second > 0.0001)
{
- this.progress.LoadSpeed = this.progress.Size / 1024 / second;
+ this.progress.LoadSpeed = this.progress.Size / 1024 / second;
}
//更新进度
SetResourcesUpdateState(false, ResourcesUpdateState.UpdateResourcesProgress, this.progress);
@@ -281,7 +283,7 @@ namespace ResUpdate
}
else
{
- Debug.LogError("load fail==============="+fileName);
+ Debug.LogError("load fail===============" + fileName);
SetResourcesUpdateState(true, ResourcesUpdateState.UpdateResourcesFailed);
}
}
@@ -305,6 +307,10 @@ namespace ResUpdate
///
IEnumerator GetGameVersion()
{
+ while (AppConst.isSDKLogin && !SDKManager.Instance.IsLogin)
+ {
+ yield return null;
+ }
SetResourcesUpdateState(false, ResourcesUpdateState.GetGameConfigs);
if (!AppConst.isUpdate)
@@ -448,7 +454,7 @@ namespace ResUpdate
if (CheckNeedDownLoad(newFile, streamFile, persistentFile))
{
BaseLogger.LogFormat("NeedDownLoad====>FileName:{3}:[NewFile.CRC:{0}],[StreamFile.CRC:{1}],[PersistentFile.CRC:{2}]",
- newFile!=null?newFile.crc:"Null",
+ newFile != null ? newFile.crc : "Null",
streamFile != null ? streamFile.crc : "Null",
persistentFile != null ? persistentFile.crc : "Null",
newFile.fileName
@@ -467,7 +473,7 @@ namespace ResUpdate
///
void DeleteUnUseFiles(List files)
{
- if(BaseLogger.isDebug) BaseLogger.LogFormat("ResUpdate=====>DeleteUnUseFiles,Count:{0}", files != null ? files.Count : 0);
+ if (BaseLogger.isDebug) BaseLogger.LogFormat("ResUpdate=====>DeleteUnUseFiles,Count:{0}", files != null ? files.Count : 0);
if (files == null) return;
for (int i = 0; i < files.Count; i++)
{
@@ -559,7 +565,7 @@ namespace ResUpdate
string fileName = string.Empty;
for (int i = 0; i < files.Length; i++)
{
- fileName = files[i].Replace(UpdateConfigs.PersistentDataPath, string.Empty).Replace("\\","/");
+ fileName = files[i].Replace(UpdateConfigs.PersistentDataPath, string.Empty).Replace("\\", "/");
ResourceFile file = new ResourceFile(fileName, FileToCRC32.GetFileCRC32(files[i]));
list.Add(file);
}
@@ -591,7 +597,8 @@ namespace ResUpdate
- void UpdateSuccess() {
+ void UpdateSuccess()
+ {
SetResourcesUpdateState(true, ResourcesUpdateState.Success, localVersion);
}
@@ -604,7 +611,8 @@ namespace ResUpdate
/// 参数
void SetResourcesUpdateState(bool isFinish, ResourcesUpdateState state, object param = null)
{
- ThreadManager.Instance.QueueOnMainThread(() => {
+ ThreadManager.Instance.QueueOnMainThread(() =>
+ {
if (resourcsUpdateAction != null)
{
resourcsUpdateAction(isFinish, state, param);
diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
index 029b4f0fe2..b800f7c5eb 100644
--- a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
+++ b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
@@ -13,684 +13,684 @@ MonoBehaviour:
m_Name: DataConfigMD5Record
m_EditorClassIdentifier:
_keys:
- - ArenaRobotSetting.xlsx
- - DifferDemonsBoxPools.xlsx
- - BloodyMessagesConfig.xlsx
- - ArenaRobotConfig.xlsx
- - DifferDemonsBoxSeaons.xlsx
- - BeginnerTask.xlsx
- - EndlessMorale.xlsx
- - ErrorCodeEerverConfig.xlsx
- - EquipRefine.xlsx
- - EquipTalismanaLottery.xlsx
- - AssistanceProperty.xlsx
- - ChallengeSetting.xlsx
- - EveryDayGiftTask.xlsx
- - ErrorCodeHint.xlsx
- - AreaConfig.xlsx
- - ArenaRoom.xlsx
- - BuffEffectConfig.xlsx
- - BloodyRankConfig.xlsx
- - ElementalResonanceConfig.xlsx
- - EndlessMapConfig.xlsx
- - ChangingCardStar.xlsx
- - ChongRank.xlsx
- - DifferDemonsConfig.xlsx
- - ArroGantFly.xlsx
- - BlessingRewardPoolNew.xlsx
- - ChallengeConfig.xlsx
- - DifferDemonsStageConfig.xlsx
- - ChampionshipSetting.xlsx
- - ComposeActivity.xlsx
- - EquipSign.xlsx
- - EquipRankUp.xlsx
- - BloodyBattleReward.xlsx
- - ChangingCardPosition.xlsx
- - ChallengeMissionConfig.xlsx
- - ChallengeStarBox.xlsx
- - EndlessTask.xlsx
- - DailyTasksConfig.xlsx
- - ArenaSetting.xlsx
- - BlessingConfig.xlsx
- - BlessingConfigNew.xlsx
- - BloodyBattleSetting.xlsx
- - EquipSignSetting.xlsx
- - AdventureReward.xlsx
- - ChongRankInfo.xlsx
- - CampTowerSetting.xlsx
- - EquipSuiteConfig.xlsx
- - ChallengeStage.xlsx
- - CompareNumChaper.xlsx
- - ComposeBook.xlsx
- - EquipStarsConfig.xlsx
- - EveryDayGift.xlsx
- - BeStronger.xlsx
- - ChangingForce.xlsx
- - AdventureConfig.xlsx
- - ExpeditionSetting.xlsx
- - DialRewardConfig.xlsx
- - ActivityDropReward.xlsx
- - ChampionshipReward.xlsx
- - BloodyBattleTask.xlsx
- - EquipStrengthen.xlsx
- - ExchangeActivityConfig.xlsx
- - DailyChallengeConfig.xlsx
- - BlessingRewardPool.xlsx
- - ArenaLevel.xlsx
- - ArenaBattleReward.xlsx
- - ChongRankInformation.xlsx
- - BloodyBattleTreasure.xlsx
- - CustomEventConfig.xlsx
- - AssistanceConfig.xlsx
- - EndlessTreasure.xlsx
- - DialRewardSetting.xlsx
- - DuoDuiTowerConfig.xlsx
- - EndlessHeroProp.xlsx
- - EndlessDifficulty.xlsx
- - CompareNumSetting.xlsx
- - ChangingCard.xlsx
- - ChallengeMapConfig.xlsx
- - DifferDemonsBoxSetting.xlsx
- - DuoDuiTowerHero.xlsx
- - ArenaReward.xlsx
- - CompareNumBuild.xlsx
- - ActivityRankingReward.xlsx
- - EquipPropertyPool.xlsx
- - ChapterOptionConfig.xlsx
- - ExpeditionDaily.xlsx
- - ExchangeRate.xlsx
- AchievementConfig.xlsx
- - ExpeditionRecruitConfig.xlsx
- - ExpeditionNodeConfig.xlsx
- ActivityGroups.xlsx
+ - AssistanceProperty.xlsx
+ - AdventureConfig.xlsx
- AccomplishmentConfig.xlsx
- - ExploreFight.xlsx
+ - ArenaRobotConfig.xlsx
+ - ChallengeSetting.xlsx
+ - ArenaReward.xlsx
+ - BlessingConfigNew.xlsx
+ - BlessingRewardPool.xlsx
+ - BuffEffectConfig.xlsx
+ - ArenaLevel.xlsx
+ - AreaConfig.xlsx
+ - AdventureReward.xlsx
+ - ActivityRankingReward.xlsx
+ - ArenaRoom.xlsx
+ - BeginnerTask.xlsx
+ - BlessingConfig.xlsx
- AudioConfig.xlsx
- - ExploreEvent.xlsx
- - GuildLevelConfig.xlsx
- - FaxiangStarConfig.xlsx
- - Explore.xlsx
- - GuildScoreConfig.xlsx
- - GuildBossRewardConfig.xlsx
- - GuildCheckpointConfig.xlsx
- - GodSacrificeConfig.xlsx
- - GodHoodTreeSetting.xlsx
- - GodHoodTreeLevel.xlsx
- - GemConfig.xlsx
- - GoodsConfig.xlsx
- - GiftConfig.xlsx
- - FoodsConfig.xlsx
- - CombatControl.xlsx
- - FaxiangConfig.xlsx
- - FakeBattle.xlsx
- - ExploreTask.xlsx
- - FakeBattleNew.xlsx
- - ExploreFunctionConfig.xlsx
- - HeroSacrifice.xlsx
- - HotRanking.xlsx
- - Hongmeng.xlsx
- - GuildBossConfig.xlsx
- - FourQuadrantConfig.xlsx
- - GuideBattleConfig.xlsx
- - GuildSacrificeConfig.xlsx
- - GuildRewardConfig.xlsx
- - HomeLandTask.xlsx
- - FreeTravelStore.xlsx
- - GoodLuck.xlsx
- - HomeLand.xlsx
- - GuildSetting.xlsx
- - DialogueViewConfig.xlsx
- - GuildHelpConfig.xlsx
- - HeroChange.xlsx
- - DifferDemonsComonpentsConfig.xlsx
- - GMInfo.xlsx
- - GameSetting.xlsx
- - GuildWarRewardConfig.xlsx
- - GMMaster.xlsx
- - GuildSacrificeRewardConfig.xlsx
- - GuildWarConfig.xlsx
- - GodSacrificeSetting.xlsx
- - GlobalSystemConfig.xlsx
- - HardStageBuff.xlsx
- - LingLongPool.xlsx
- - HardStageChapter.xlsx
- - LodeRankReward.xlsx
- - ExpeditionFloorConfig.xlsx
- - HardStageCondition.xlsx
- - FaxiangLevelConfig.xlsx
- - GuildRedPackConfig.xlsx
- - LotterySpecialConfig.xlsx
- - LevelTips.xlsx
- - LuckyCatConfig.xlsx
- - JumpConfig.xlsx
- - JewelConfig.xlsx
- - ExpeditionHolyConfig.xlsx
- - LevelSetting.xlsx
- - Loading.xlsx
- - ChangingCardLevel.xlsx
- - JourneyWithWind.xlsx
- - JewelResonanceConfig.xlsx
- - GemConfigNew.xlsx
- - HeroRankupGroup.xlsx
- - FreeTravel.xlsx
- - HeroRankupConfig.xlsx
- - HardStageReward.xlsx
- - MServerArenaMatchConfig.xlsx
- - HongmengUp.xlsx
- - MainLevelSettingConfig.xlsx
- - LotterySetting.xlsx
- - LuxuryFund.xlsx
- - HeroSkin.xlsx
- - PackPush.xlsx
- - LevelDifficultyConfig.xlsx
- - ShenBingSetting.xlsx
- - GuideConfig.xlsx
- - MainLevelBoss.xlsx
- - GuildCheckpointRank.xlsx
- - GlobalActivity.xlsx
- - MonthcardConfig.xlsx
- - MServerArenaReward.xlsx
- - NewHeroConfig.xlsx
- - QijieStageBuff.xlsx
- - MainMapIconConfig.xlsx
- - MServerLodeSetting.xlsx
- - MazeTreasureSetting.xlsx
- - MServerRankConfig.xlsx
- - MServerRankReward.xlsx
- - LoginPosterConfig.xlsx
- - HeroReturn.xlsx
- - PropertyConfig.xlsx
- - ServerGuildWarRankReward.xlsx
- - ChapterEventPointConfig.xlsx
- - HomeLandLevel.xlsx
- - QijieTreasure.xlsx
- - PlayerRole.xlsx
- - MServerArenaSetting.xlsx
- - LikeAbility.xlsx
- - PlayerMountLevelUp.xlsx
- - GemLotteryConfig.xlsx
- - QijieRanking.xlsx
- - QijieUpgrade.xlsx
- - potentialConfig.xlsx
- - ActivityRewardConfig.xlsx
- - PrestigeConfig.xlsx
- - QijieStage.xlsx
- - RidingSwardResult.xlsx
- - PlayerSkillBasicTable.xlsx
- - SeverConfig.xlsx
- - ServerGuildWarNpcLevel.xlsx
- - ServerGuildWarRobotConfig.xlsx
- - ServerGuildWarLampConfig.xlsx
- - PlayerAppearance.xlsx
- - LodeConfig.xlsx
- - QAConfig.xlsx
- - RidingSwardConfig.xlsx
- - EquipConfig.xlsx
- - RechargeCommodityorder.xlsx
- - QijieHolyConfig.xlsx
- - RidingSwardSence.xlsx
- - RaceTowerRewardConfig.xlsx
- - RaceTowerConfig.xlsx
- - ShenBingSkill.xlsx
- - PlayerHeadIcon.xlsx
- - MazeTreasure.xlsx
- - MissionEventsConfig.xlsx
- - OptionAddCondition.xlsx
- - PackageConfig.xlsx
- - StoryMapConfig.xlsx
- - PotentialNewConfig.xlsx
- - MonsterViewConfig.xlsx
- - RecommendTeam.xlsx
- - RunesConfig.xlsx
- - ServerGuildWarSetting.xlsx
- - SevenDaysActivity.xlsx
- - ShenBing.xlsx
- - CompareNumItem.xlsx
- - SevenDaysScore.xlsx
- - RunesPoolConfig.xlsx
- - RobotProperty.xlsx
- - ServerGuildWarMapConfig.xlsx
- - SpiritAnimal.xlsx
- - SpiritAnimalSummon.xlsx
- - TrainBuild.xlsx
- - ShenbingStar.xlsx
- - SpiritAnimalSetting.xlsx
- - RobotSkill.xlsx
- - RunesSkillPoolConfig.xlsx
+ - ArroGantFly.xlsx
+ - AssistanceConfig.xlsx
+ - BeStronger.xlsx
- ArtResourcesConfig.xlsx
- - PlayerLevelConfig.xlsx
- - HeroLevelConfig.xlsx
- - LotteryRewardConfig.xlsx
- - PrivilegeTypeConfig.xlsx
- - SignInConfig.xlsx
+ - ChangingCardPosition.xlsx
+ - BlessingRewardPoolNew.xlsx
+ - ActivityDropReward.xlsx
+ - ChangingCardStar.xlsx
+ - ActivityRewardConfig.xlsx
+ - ChapterOptionConfig.xlsx
+ - BloodyRankConfig.xlsx
+ - BloodyBattleSetting.xlsx
+ - CombatControl.xlsx
+ - BloodyBattleReward.xlsx
+ - ChongRankInfo.xlsx
+ - CompareNumSetting.xlsx
+ - ChongRank.xlsx
+ - ChallengeStage.xlsx
+ - CampTowerSetting.xlsx
+ - BloodyMessagesConfig.xlsx
+ - ArenaRobotSetting.xlsx
+ - ArenaSetting.xlsx
+ - ArenaBattleReward.xlsx
+ - ChallengeConfig.xlsx
- CampTowerConfig.xlsx
- - SystemMessageConfig.xlsx
- - SpiritAnimalStar.xlsx
- - WorldBossConfig.xlsx
- - RoleConfig.xlsx
- - SoldiersLevelConfig.xlsx
- - SpecialConfig.xlsx
- - TrainSetting.xlsx
- - TestWelfare.xlsx
- - SoldiersLotteryConfig.xlsx
- - TabulationConfig.xlsx
- - SuperZhenChong.xlsx
- - StoreTypeConfig.xlsx
- - TipsConfig.xlsx
- - SurpriseBox.xlsx
- - SummonTreasure.xlsx
- - SpiritAnimalSkill.xlsx
- - TaskConfig.xlsx
- - WorkShopTechnologySetting.xlsx
- - SpiritAnimalBook.xlsx
- - ShenBingLevel.xlsx
- - TrialSetting.xlsx
- - HeroConfig.xlsx
- - RunesLevelUp.xlsx
- - ThemeActivityShop.xlsx
- - GuildTechnology.xlsx
- - TrainBuildLevel.xlsx
- - WorkShopEquipmentConfig.xlsx
+ - ChongRankInformation.xlsx
+ - CompareNumItem.xlsx
+ - ChangingForce.xlsx
+ - ComposeBook.xlsx
+ - DialRewardSetting.xlsx
+ - CustomEventConfig.xlsx
+ - BloodyBattleTreasure.xlsx
+ - ChallengeMissionConfig.xlsx
+ - CompareNumBuild.xlsx
+ - ChampionshipSetting.xlsx
+ - DifferDemonsBoxPools.xlsx
+ - ChampionshipReward.xlsx
+ - DailyTasksConfig.xlsx
+ - DailyChallengeConfig.xlsx
+ - DialogueViewConfig.xlsx
+ - ChangingCardLevel.xlsx
+ - ChapterEventPointConfig.xlsx
+ - EndlessTreasure.xlsx
+ - ElementalResonanceConfig.xlsx
+ - EndlessDifficulty.xlsx
+ - DuoDuiTowerConfig.xlsx
+ - CompareNumChaper.xlsx
+ - ChangingCard.xlsx
+ - ComposeActivity.xlsx
+ - ChallengeStarBox.xlsx
+ - EndlessMapConfig.xlsx
+ - BloodyBattleTask.xlsx
+ - ChallengeMapConfig.xlsx
+ - EndlessMorale.xlsx
+ - DifferDemonsBoxSetting.xlsx
+ - ExpeditionRecruitConfig.xlsx
+ - EndlessHeroProp.xlsx
+ - EquipPropertyPool.xlsx
+ - ExchangeRate.xlsx
+ - EveryDayGift.xlsx
+ - DifferDemonsBoxSeaons.xlsx
+ - EndlessTask.xlsx
+ - EquipRankUp.xlsx
+ - EquipSignSetting.xlsx
+ - ExploreEvent.xlsx
+ - EquipTalismanaLottery.xlsx
+ - DifferDemonsConfig.xlsx
+ - EquipStarsConfig.xlsx
+ - ExpeditionDaily.xlsx
+ - ExpeditionNodeConfig.xlsx
+ - DuoDuiTower.xlsx
+ - EveryDayGiftTask.xlsx
+ - DifferDemonsStageConfig.xlsx
+ - DuoDuiTowerHero.xlsx
+ - DifferDemonsComonpentsConfig.xlsx
+ - EquipSign.xlsx
+ - EquipSuiteConfig.xlsx
+ - ExpeditionSetting.xlsx
+ - ExchangeActivityConfig.xlsx
+ - DialRewardConfig.xlsx
+ - ExpeditionFloorConfig.xlsx
+ - EquipConfig.xlsx
+ - EquipRefine.xlsx
+ - EquipStrengthen.xlsx
+ - Explore.xlsx
+ - ErrorCodeEerverConfig.xlsx
+ - ErrorCodeHint.xlsx
+ - ExpeditionHolyConfig.xlsx
+ - ExploreFight.xlsx
+ - EquipTalismana.xlsx
+ - FakeBattleNew.xlsx
+ - FaxiangLevelConfig.xlsx
+ - ExploreFunctionConfig.xlsx
+ - MazeTreasureSetting.xlsx
+ - LevelTips.xlsx
+ - GuideBattleConfig.xlsx
+ - GMMaster.xlsx
+ - GoodsConfig.xlsx
+ - GuildBossRewardConfig.xlsx
+ - GlobalSystemConfig.xlsx
+ - JourneyWithWind.xlsx
+ - JewelConfig.xlsx
+ - EventPointConfig.xlsx
+ - LodeRankReward.xlsx
+ - GMInfo.xlsx
+ - HeroSkin.xlsx
+ - Loading.xlsx
+ - JumpConfig.xlsx
+ - HardStageCondition.xlsx
+ - HongmengUp.xlsx
+ - LikeAbility.xlsx
+ - FakeBattle.xlsx
+ - MainLevelSettingConfig.xlsx
+ - LuckyCatConfig.xlsx
+ - FaxiangStarConfig.xlsx
+ - GlobalActivity.xlsx
+ - MazeTreasure.xlsx
+ - LuxuryFund.xlsx
+ - GameSetting.xlsx
+ - FoodsConfig.xlsx
+ - GodHoodTreeSetting.xlsx
+ - FourQuadrantConfig.xlsx
+ - GoodLuck.xlsx
+ - GodSacrificeConfig.xlsx
+ - JewelResonanceConfig.xlsx
+ - GiftConfig.xlsx
+ - ExploreTask.xlsx
+ - GodSacrificeSetting.xlsx
+ - GemLotteryConfig.xlsx
+ - GemConfig.xlsx
+ - FaxiangConfig.xlsx
+ - GodHoodTreeLevel.xlsx
+ - FreeTravelStore.xlsx
- JewelRankupConfig.xlsx
+ - FreeTravel.xlsx
+ - GemConfigNew.xlsx
+ - FloodConfig.xlsx
+ - GuildSacrificeConfig.xlsx
+ - MonthcardConfig.xlsx
+ - LingLongPool.xlsx
+ - GuildSacrificeRewardConfig.xlsx
+ - HomeLandTask.xlsx
+ - HeroSacrifice.xlsx
+ - LotterySpecialConfig.xlsx
+ - MServerArenaReward.xlsx
+ - HotRanking.xlsx
+ - HomeLandLevel.xlsx
+ - MainLevelBoss.xlsx
+ - LotteryRewardConfig.xlsx
+ - HardStage.xlsx
+ - Language.xlsx
+ - HardStageChapter.xlsx
+ - HardStageBuff.xlsx
+ - HomeLand.xlsx
+ - MonsterViewConfig.xlsx
+ - HeroRankupConfig.xlsx
+ - MissionEventsConfig.xlsx
+ - LotterySetting.xlsx
+ - HeroRankupGroup.xlsx
+ - GuildCheckpointRank.xlsx
+ - LoginPosterConfig.xlsx
+ - GuildRedPackConfig.xlsx
+ - Hongmeng.xlsx
+ - GuildRewardConfig.xlsx
+ - GuildLevelConfig.xlsx
+ - GuildScoreConfig.xlsx
+ - MServerArenaMatchConfig.xlsx
+ - GuildBossConfig.xlsx
+ - HeroReturn.xlsx
+ - GuildTechnology.xlsx
+ - GuildSetting.xlsx
+ - HeroConfig.xlsx
+ - HeroChange.xlsx
+ - GuideConfig.xlsx
+ - ItemConfig.xlsx
+ - HeroLevelConfig.xlsx
+ - MServerLodeSetting.xlsx
+ - MainMapIconConfig.xlsx
+ - HardStageReward.xlsx
+ - LodeConfig.xlsx
+ - GuildWarRewardConfig.xlsx
+ - LevelSetting.xlsx
+ - MServerArenaSetting.xlsx
+ - GuildWarConfig.xlsx
+ - GuildHelpConfig.xlsx
+ - GuildCheckpointConfig.xlsx
+ - MainLevelConfig.xlsx
+ - MapPointConfig.xlsx
+ - MServerRankReward.xlsx
+ - MServerRankConfig.xlsx
+ - MonsterGroup.xlsx
+ - OptionAddCondition.xlsx
+ - LevelDifficultyConfig.xlsx
+ - RidingSwardResult.xlsx
+ - NewHeroConfig.xlsx
+ - TrainBuild.xlsx
+ - PlayerRole.xlsx
+ - ShenBingLevel.xlsx
+ - TrainSetting.xlsx
+ - TrialKillConfig.xlsx
+ - PlayerAppearance.xlsx
+ - SpiritAnimalSetting.xlsx
+ - ServerGuildWarNpcLevel.xlsx
+ - ShenBingSkill.xlsx
+ - SevenDaysActivity.xlsx
+ - SeverConfig.xlsx
+ - SignInConfig.xlsx
+ - TestWelfare.xlsx
+ - TabulationConfig.xlsx
+ - StoreTypeConfig.xlsx
+ - SpiritAnimalSummon.xlsx
+ - PlayerSkillBasicTable.xlsx
+ - RunesSkillPoolConfig.xlsx
+ - TaskConfig.xlsx
+ - PackPush.xlsx
+ - SurpriseBox.xlsx
+ - SoldiersLevelConfig.xlsx
+ - SoldiersSetting.xlsx
+ - SoldiersLotteryConfig.xlsx
+ - RunesLevelUp.xlsx
+ - StoryMapConfig.xlsx
+ - ShenBingSetting.xlsx
+ - QijieHolyConfig.xlsx
+ - RandomName.xlsx
+ - RoleConfig.xlsx
+ - PrestigeConfig.xlsx
+ - PlayerLevelConfig.xlsx
+ - SpiritAnimal.xlsx
+ - ShenBing.xlsx
+ - TreasureTaskConfig.xlsx
+ - ServerGuildWarMapConfig.xlsx
+ - RobotSkill.xlsx
+ - RaceTowerConfig.xlsx
+ - potentialConfig.xlsx
+ - SkillConfig.xlsx
+ - RaceTowerRewardConfig.xlsx
+ - TipsConfig.xlsx
+ - SpiritAnimalStar.xlsx
+ - ThemeActivityShop.xlsx
+ - QijieStageBuff.xlsx
+ - QijieStage.xlsx
+ - Train.xlsx
+ - QijieTreasure.xlsx
+ - ThemeActivityTaskConfig.xlsx
+ - QijieUpgrade.xlsx
+ - MonsterConfig.xlsx
+ - RecommendTeam.xlsx
+ - SummonTreasure.xlsx
+ - SystemMessageConfig.xlsx
+ - SpiritAnimalBook.xlsx
+ - TrainBuildLevel.xlsx
+ - PropertyConfig.xlsx
+ - RidingSwardSence.xlsx
+ - RunesConfig.xlsx
+ - SpiritAnimalSkill.xlsx
+ - SpiritAnimalLevel.xlsx
+ - TrialConfig.xlsx
+ - TrialGameConfig.xlsx
+ - StoreConfig.xlsx
+ - PlayerHeadIcon.xlsx
+ - PackageConfig.xlsx
+ - RobotProperty.xlsx
+ - PlayerSkill.xlsx
+ - PassiveSkillLogicConfig.xlsx
+ - PassiveSkillConfig.xlsx
+ - RechargeCommodityConfig.xlsx
+ - SoldierStageConfig.xlsx
+ - Trump.xlsx
+ - SkillLogicConfig.xlsx
+ - SpecialConfig.xlsx
+ - ServerGuildWarRankReward.xlsx
+ - PlayerMountLevelUp.xlsx
+ - ShenbingStar.xlsx
+ - TreasureSunlongTaskConfig.xlsx
+ - QAConfig.xlsx
+ - PotentialNew.xlsx
+ - OptionConfig.xlsx
+ - RewardItemConfig.xlsx
+ - SuperZhenChong.xlsx
+ - RechargeCommodityorder.xlsx
+ - ServerGuildWarSetting.xlsx
+ - RidingSwardConfig.xlsx
+ - SevenDaysScore.xlsx
+ - ServerGuildWarRobotConfig.xlsx
+ - WeekcardConfig.xlsx
+ - PotentialNewConfig.xlsx
+ - QijieRanking.xlsx
+ - TreasureSunlongConfig.xlsx
+ - ServerGuildWarLampConfig.xlsx
+ - WorkShopTechnologySetting.xlsx
+ - RunesPoolConfig.xlsx
+ - XiuXianSkill.xlsx
+ - PrivilegeTypeConfig.xlsx
+ - WorldBossTreasureConfig.xlsx
+ - TrialQuestionConfig.xlsx
+ - TrialSetting.xlsx
+ - WorldBossSetting.xlsx
+ - XiuXian.xlsx
+ - WorkShopSetting.xlsx
+ - WorkShopFunctionConfig.xlsx
+ - WorldBossConfig.xlsx
+ - TrumpStar.xlsx
- WorkShopFoundationConfig.xlsx
- WishConfig.xlsx
- - ThemeActivityTaskConfig.xlsx
- WorkShopRebuildConfig.xlsx
- - PlayerSkill.xlsx
- - TrialGameConfig.xlsx
- - WorkShopFunctionConfig.xlsx
- - WeekRewardConfig.xlsx
- - WeekcardConfig.xlsx
- - VipLevelConfig.xlsx
- - TrumpLevelupPool.xlsx
- - WorkShopSetting.xlsx
- - TrumpBook.xlsx
- - FloodConfig.xlsx
- - TrialQuestionConfig.xlsx
- - Trump.xlsx
- - TrumpStar.xlsx
- - TrialwelfareConfig.xlsx
- - SoldiersSetting.xlsx
- - TrialKillConfig.xlsx
- - WishActivityUp.xlsx
- WeekcardRotationConfig.xlsx
- - WishActivityPool.xlsx
- - UniversalWelfareConfig.xlsx
- - WishActivitySetting.xlsx
- - TreasureTaskConfig.xlsx
- - XiuXianSkill.xlsx
- - WorldBossTreasureConfig.xlsx
- - Train.xlsx
- - WorldBossSetting.xlsx
- - TreasureSunlongTaskConfig.xlsx
+ - WorkShopEquipmentConfig.xlsx
- WorldBossRewardConfig.xlsx
+ - TrialwelfareConfig.xlsx
+ - WishActivitySetting.xlsx
+ - TrumpBook.xlsx
+ - UniversalWelfareConfig.xlsx
+ - WeekRewardConfig.xlsx
+ - TrumpLevelupPool.xlsx
+ - WishActivityUp.xlsx
+ - VipLevelConfig.xlsx
+ - WishActivityPool.xlsx
- UIConfig.xlsx
- - RandomName.xlsx
- - RechargeCommodityConfig.xlsx
- - TrialConfig.xlsx
- - SpiritAnimalLevel.xlsx
- - SkillConfig.xlsx
- - MapPointConfig.xlsx
- - XiuXian.xlsx
- - TreasureSunlongConfig.xlsx
- - PassiveSkillConfig.xlsx
- - EventPointConfig.xlsx
- - ItemConfig.xlsx
- - PassiveSkillLogicConfig.xlsx
- - WorkShopTechnology.xlsx
- - SkillLogicConfig.xlsx
- - OptionConfig.xlsx
- - HardStage.xlsx
- - DuoDuiTower.xlsx
- RewardGroup.xlsx
+ - WorkShopTechnology.xlsx
- ServerGuildWarRobotProperty.xlsx
- - EquipTalismana.xlsx
- - StoreConfig.xlsx
- - SoldierStageConfig.xlsx
- - RewardItemConfig.xlsx
- - MainLevelConfig.xlsx
- - Language.xlsx
- - PotentialNew.xlsx
- - MonsterGroup.xlsx
- - MonsterConfig.xlsx
_values:
- - 1289424307
- - 903221398
- - 4055477448
- - 2456510325
- - 249002466
- - 755222564
- - 2131729866
- - 2056157201
- - 2003978322
- - 2210693178
- - 2528647971
- - 1705732776
- - 3817747876
- - 1719661765
- - 413963702
- - 1992142629
- - 1011215564
- - 2547640248
- - 583891024
- - 2530885670
- - 1665910201
- - 1316886774
- - 460607005
- - 3435201910
- - 2176732522
- - 2759035733
- - 1402356663
- - 3338153430
- - 596226076
- - 1790592577
- - 1843287958
- - 230994945
- - 2611058269
- - 1572157444
- - 1565259591
- - 3411140759
- - 2860620875
- - 3015812436
- - 996682802
- - 3868340105
- - 2050621784
- - 2125792087
- - 613479935
- - 11618767
- - 897391413
- - 1088442899
- - 3544974280
- - 3483589588
- - 3166992917
- - 2056208125
- - 3340191043
- - 1470059749
- - 1263132159
- - 1848421159
- - 1777412673
- - 1239521421
- - 3591751192
- - 2943614740
- - 2131302457
- - 1348779616
- - 3065430582
- - 2563264694
- - 727241138
- - 1535966236
- - 2445511907
- - 4054860013
- - 3868959545
- - 2944506204
- - 3440870845
- - 3269290813
- - 3408707793
- - 3347820180
- - 2131811081
- - 2675197889
- - 3318831161
- - 522420914
- - 1635635627
- - 932779961
- - 3596238933
- - 2750281646
- - 4086180972
- - 1317526585
- - 3153107712
- - 473379176
- - 2504462503
- - 1615711823
- 2081747528
- - 3186903494
- - 3425624132
- 2055394639
+ - 2528647971
+ - 1848421159
- 427098595
- - 2403795046
+ - 2456510325
+ - 1705732776
+ - 2750281646
+ - 3868340105
+ - 727241138
+ - 1011215564
+ - 1535966236
+ - 413963702
+ - 613479935
+ - 1317526585
+ - 1992142629
+ - 755222564
+ - 996682802
- 3292694387
- - 3780743701
- - 2596185635
- - 1454531937
- - 1615267901
- - 3079207713
- - 3943131728
- - 3328950972
- - 2576521861
- - 2015872668
- - 2865006876
- - 240050166
- - 992794087
- - 11995368
- - 2524268684
- - 517130915
- - 1424628135
- - 3224705358
- - 2714366993
- - 2358376092
- - 1345627381
- - 4166687202
- - 1427785703
- - 540024368
- - 173728414
- - 1160354694
- - 2325343974
- - 496645114
- - 3590261683
- - 2790965744
- - 285912347
- - 838236963
- - 607619906
- - 1354167508
- - 1343107678
- - 2516155166
- - 1517420778
- - 568553271
- - 1186647594
- - 4169773728
- - 438996698
- - 1920456179
- - 1468913191
- - 3249316745
- - 3254997270
- - 2832265204
- - 896247011
- - 2222075784
- - 1447105885
- - 281060343
- - 1336193573
- - 4004935275
- - 2891922208
- - 2317172581
- - 1663801712
- - 3522933141
- - 1675475036
- - 992548592
- - 500941966
- - 2949689770
- - 3705022903
- - 624011882
- - 1930114035
- - 2948095248
- - 3135292950
- - 2116653823
- - 1486881882
- - 3563263569
- - 3130060496
- - 522887915
- - 4126956820
- - 2166111311
- - 1356683928
- - 876203986
- - 2838430456
- - 2903039526
- - 1058088443
- - 295715991
- - 1315259476
- - 1149857741
- - 2028967550
- - 2720298517
- - 873854182
- - 3275552860
- - 2726875163
- - 3050511722
- - 3267854989
- - 260126611
- - 1891705897
- - 713788334
- - 2235035588
- - 3569866406
- - 2122574654
- - 455875827
- - 4054929713
- - 2506794607
- - 3304921572
- - 2254770675
- - 2408193458
- - 443915512
- - 2231669021
- - 4280505934
- - 319164499
- - 539061226
- - 2172760228
- - 3512283232
- - 133924285
- - 1165509075
- - 767891664
- - 2280083959
- - 903205052
- - 1653642818
- - 2748321716
- - 3900848043
- - 3538658241
- - 1494230441
- - 568109215
- - 4243616284
- - 3253055618
- - 2692277816
- - 3496679628
- - 1730871209
- - 2128509800
- - 2150980036
- - 2962861863
- - 2549192378
- - 1021105451
- - 1550993015
- - 2802781730
- - 3625815197
- - 48773521
- - 2331988609
- - 404574725
- - 2108764134
- - 515856748
- - 3195948091
- - 1953805257
- - 1766926465
- - 160427834
- - 1783990105
- - 3352371635
- - 1952787401
- - 2012794773
- - 907117307
- - 2793451870
- - 2303212371
- - 1710633966
- - 1060024667
- - 1988690131
- - 437016154
- - 523973031
- - 1981360931
+ - 3435201910
+ - 3440870845
+ - 1470059749
- 1828386051
- - 1192422623
- - 3121374430
- - 1559843583
- - 1824092668
- - 1514248831
+ - 2611058269
+ - 2176732522
+ - 3591751192
+ - 1665910201
+ - 1165509075
+ - 473379176
+ - 2547640248
+ - 2050621784
+ - 517130915
+ - 230994945
+ - 11618767
+ - 3318831161
+ - 1316886774
+ - 3544974280
+ - 897391413
+ - 4055477448
+ - 1289424307
+ - 3015812436
+ - 2445511907
+ - 2759035733
- 1647829924
- - 3806028626
- - 4050838680
- - 2555366341
- - 4057056415
- - 1166593504
- - 1810605413
- - 1339880620
- - 4291486445
- - 284723102
- - 2351385782
- - 2435918854
- - 3914369697
- - 2150479242
- - 243901961
- - 1639564979
- - 232371317
- - 3970864563
- - 3048495520
- - 1162671775
- - 1567357188
- - 141295447
- - 3642314873
- - 2399906
- - 3344299354
- - 4054523692
- - 1295572658
- - 110435588
+ - 4054860013
+ - 3352371635
+ - 1263132159
+ - 3166992917
+ - 3408707793
+ - 2944506204
+ - 3868959545
+ - 1572157444
+ - 4086180972
+ - 3338153430
+ - 903221398
+ - 2943614740
+ - 2860620875
+ - 2563264694
+ - 1343107678
+ - 1930114035
+ - 3304921572
+ - 3269290813
+ - 583891024
+ - 2675197889
+ - 3347820180
+ - 3483589588
+ - 522420914
+ - 596226076
+ - 1565259591
+ - 2530885670
+ - 2131302457
+ - 1635635627
+ - 2131729866
+ - 932779961
+ - 3186903494
+ - 2131811081
+ - 3153107712
+ - 1615711823
+ - 3340191043
+ - 249002466
+ - 3411140759
+ - 1843287958
+ - 2125792087
+ - 3780743701
+ - 2210693178
+ - 460607005
+ - 2056208125
+ - 2504462503
+ - 3425624132
+ - 1081913525
+ - 3817747876
+ - 1402356663
+ - 3596238933
+ - 568553271
+ - 1790592577
+ - 1088442899
+ - 1777412673
+ - 3065430582
+ - 1239521421
+ - 1336193573
+ - 3496679628
+ - 2003978322
+ - 1348779616
+ - 1615267901
+ - 2238904969
+ - 1719661765
+ - 2949689770
+ - 2403795046
+ - 2159165530
+ - 2358376092
+ - 2891922208
+ - 1345627381
+ - 713788334
+ - 3522933141
+ - 2325343974
+ - 1920456179
+ - 992794087
+ - 3943131728
+ - 2832265204
+ - 2948095248
+ - 500941966
+ - 3539284548
+ - 281060343
+ - 1186647594
+ - 2903039526
+ - 624011882
+ - 992548592
+ - 4004935275
+ - 2166111311
+ - 4280505934
+ - 3224705358
+ - 1356683928
+ - 1675475036
+ - 1454531937
+ - 873854182
+ - 2802781730
+ - 2838430456
+ - 4169773728
+ - 2524268684
+ - 2015872668
+ - 1160354694
+ - 838236963
+ - 2576521861
+ - 3135292950
+ - 11995368
+ - 2714366993
+ - 3254997270
+ - 539061226
+ - 240050166
+ - 1424628135
+ - 2865006876
+ - 285912347
- 1163590508
+ - 3563263569
+ - 2116653823
+ - 1763054177
+ - 496645114
+ - 3275552860
+ - 2222075784
+ - 1468913191
+ - 2790965744
+ - 4166687202
+ - 1663801712
+ - 2726875163
+ - 1427785703
+ - 2254770675
+ - 2028967550
+ - 1559843583
+ - 1354983198
+ - 2829696409
+ - 1447105885
+ - 896247011
+ - 607619906
+ - 515856748
+ - 3130060496
+ - 3625815197
+ - 876203986
+ - 1486881882
+ - 2720298517
+ - 2122574654
+ - 2317172581
+ - 540024368
+ - 3590261683
+ - 2596185635
+ - 3079207713
+ - 4126956820
+ - 173728414
+ - 455875827
+ - 4054523692
+ - 1354167508
+ - 3642314873
+ - 1517420778
+ - 1149857741
+ - 3546236153
+ - 3121374430
+ - 1891705897
+ - 260126611
+ - 522887915
+ - 4243616284
+ - 438996698
+ - 3705022903
+ - 2231669021
+ - 3249316745
+ - 2516155166
+ - 3328950972
+ - 958156670
+ - 3088875094
+ - 3569866406
+ - 2235035588
+ - 638032647
+ - 48773521
+ - 295715991
+ - 903205052
+ - 3050511722
+ - 1060024667
+ - 443915512
+ - 1567357188
+ - 1339880620
+ - 2421207484
+ - 568109215
+ - 437016154
+ - 3900848043
+ - 1021105451
+ - 160427834
+ - 2748321716
+ - 1514248831
+ - 4291486445
+ - 2351385782
+ - 3914369697
+ - 1710633966
+ - 1653642818
+ - 1981360931
+ - 3970864563
+ - 1058088443
+ - 243901961
+ - 1166593504
+ - 3680822084
+ - 284723102
+ - 2399906
+ - 404574725
+ - 1315259476
+ - 2128509800
+ - 1008523799
+ - 4057056415
+ - 767891664
+ - 1192422623
+ - 2303212371
+ - 1783990105
+ - 3577622290
+ - 2793451870
+ - 523973031
+ - 2549192378
+ - 133924285
+ - 802820437
+ - 2962861863
+ - 2150479242
+ - 4050838680
+ - 3344299354
+ - 3267854989
+ - 2280083959
+ - 3279229614
+ - 2408193458
+ - 148081205
+ - 3512283232
+ - 596983005
+ - 3195948091
+ - 1639564979
+ - 3806028626
+ - 1162671775
+ - 1295572658
+ - 4054929713
+ - 2150980036
+ - 1953805257
+ - 232371317
+ - 4035646659
+ - 2249322777
+ - 1234461148
+ - 1028160648
+ - 1550993015
+ - 2331988609
+ - 907117307
+ - 2661528613
+ - 790589828
+ - 1242411477
+ - 3313165344
+ - 3893124494
+ - 3287926489
+ - 3046104500
+ - 1810605413
+ - 2506794607
+ - 319164499
+ - 1988690131
+ - 770462847
+ - 3253055618
+ - 1996728598
+ - 3963375524
+ - 3338674381
+ - 2435918854
+ - 1730871209
+ - 1766926465
+ - 2692277816
+ - 1952787401
+ - 3538658241
+ - 3261895811
+ - 2108764134
+ - 2172760228
+ - 785442789
+ - 1494230441
+ - 3048495520
+ - 2012794773
+ - 1369534219
+ - 1824092668
+ - 1249621154
+ - 651313397
+ - 141295447
+ - 1598682932
+ - 981402797
+ - 3663717884
+ - 2405621183
+ - 2555366341
+ - 366659613
- 98336120
- 2958781479
- - 148081205
- 2777840995
- - 2661528613
- - 1234461148
- - 2405621183
- - 3141154114
- - 3261895811
- - 1724901547
- - 3873781959
- - 3663717884
- - 3267888473
- - 1763054177
- - 651313397
- - 3287926489
- - 366659613
- - 3244473242
- - 3680822084
- - 2421207484
- - 2682825389
- 3680096254
- - 2621849113
- - 850112451
- - 1750396455
- - 3577622290
- - 1369534219
- - 1249621154
- - 3279229614
- - 1598682932
- - 770462847
+ - 110435588
- 3298664974
+ - 3244473242
+ - 1750396455
+ - 3267888473
+ - 850112451
+ - 3141154114
+ - 3873781959
+ - 2682825389
+ - 1724901547
+ - 2621849113
- 3061298246
- - 1008523799
- - 3995756701
- - 2249322777
- - 4035646659
- - 802820437
- - 3088875094
- - 981402797
- - 785442789
- - 2028076874
- - 3539284548
- - 3546236153
- - 790589828
- - 2453679101
- - 3046104500
- - 3963375524
- - 1354983198
- - 1081913525
- 3884675457
+ - 2453679101
- 3518092581
- - 2159165530
- - 1028160648
- - 3893124494
- - 3338674381
- - 958156670
- - 3984419727
- - 1996728598
- - 638032647
- - 596983005
diff --git a/Assets/Source/Generate/AppWrap.cs b/Assets/Source/Generate/AppWrap.cs
index 131b73a34b..5b56eac2e7 100644
--- a/Assets/Source/Generate/AppWrap.cs
+++ b/Assets/Source/Generate/AppWrap.cs
@@ -8,6 +8,7 @@ public class AppWrap
{
L.BeginClass(typeof(App), typeof(GameCore.UnitySingleton));
L.RegFunction("Initialize", Initialize);
+ L.RegFunction("LoginCallback", LoginCallback);
L.RegFunction("StartUp", StartUp);
L.RegFunction("InitResMgr", InitResMgr);
L.RegFunction("ReStart", ReStart);
@@ -51,6 +52,23 @@ public class AppWrap
}
}
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int LoginCallback(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 2);
+ App obj = (App)ToLua.CheckObject(L, 1);
+ string arg0 = ToLua.CheckString(L, 2);
+ obj.LoginCallback(arg0);
+ return 0;
+ }
+ catch (Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int StartUp(IntPtr L)
{
diff --git a/Assets/Source/Generate/SDK_SDKManagerWrap.cs b/Assets/Source/Generate/SDK_SDKManagerWrap.cs
index 5f0e8bf236..e72a49c67c 100644
--- a/Assets/Source/Generate/SDK_SDKManagerWrap.cs
+++ b/Assets/Source/Generate/SDK_SDKManagerWrap.cs
@@ -36,6 +36,7 @@ public class SDK_SDKManagerWrap
L.RegVar("onPayCallback", get_onPayCallback, set_onPayCallback);
L.RegVar("onSwitchAccountCallback", get_onSwitchAccountCallback, set_onSwitchAccountCallback);
L.RegVar("onLogoutCallback", get_onLogoutCallback, set_onLogoutCallback);
+ L.RegVar("IsLogin", get_IsLogin, null);
L.RegVar("IsInit", get_IsInit, null);
L.RegFunction("LogoutAction", SDK_SDKManager_LogoutAction);
L.RegFunction("SwitchAccountAction", SDK_SDKManager_SwitchAccountAction);
@@ -537,6 +538,25 @@ public class SDK_SDKManagerWrap
}
}
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int get_IsLogin(IntPtr L)
+ {
+ object o = null;
+
+ try
+ {
+ o = ToLua.ToObject(L, 1);
+ SDK.SDKManager obj = (SDK.SDKManager)o;
+ bool ret = obj.IsLogin;
+ LuaDLL.lua_pushboolean(L, ret);
+ return 1;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e, o, "attempt to index IsLogin on a nil value");
+ }
+ }
+
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int get_IsInit(IntPtr L)
{
diff --git a/ExportProject-1-v1.symbols.zip b/ExportProject-1-v1.symbols.zip
new file mode 100644
index 0000000000..82228d9bcd
Binary files /dev/null and b/ExportProject-1-v1.symbols.zip differ
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 2ee151b6f2..ca4a4652f0 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -267,7 +267,7 @@ PlayerSettings:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
- m_Icon: {fileID: 2800000, guid: 9f9ab0734d843254aba854513ab0b7ed, type: 3}
+ m_Icon: {fileID: 2800000, guid: 7a28dd7120687da4da57e5a8b03e6125, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0