Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

# Conflicts:
#	Assets/ManagedResources/ArtFont_en/icon_chenghao35_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_Resource_Coin_dongtian_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_Resource_Coin_fudi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_Resource_Coin_luofu_en.png.meta
xiyou_yueNanZhengshi
zhangjiannan 2024-12-17 13:20:02 +08:00
commit 90d9eb0277
20 changed files with 881 additions and 768 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 KiB

After

Width:  |  Height:  |  Size: 1.3 MiB

View File

@ -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

View File

@ -275,7 +275,7 @@ MonoBehaviour:
isDebug: 0
bundleMode: 1
luaBundleMode: 1
isUpdate: 1
isUpdate: 0
isSDK: 1
isSDKLogin: 1
isGuide: 1

View File

@ -6,6 +6,8 @@ using GameCore;
using ResMgr;
using GameLogic;
using ResourcesManager = GameLogic.ResourcesManager;
using SDK;
using UnityEngine.SocialPlatforms;
/// <summary>
/// 游戏入口
@ -205,8 +207,23 @@ public class App : UnitySingleton<App>
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("登陆成功!!!!!!!!!!!!!!");
}
}
/// <summary>
/// 启动框架
/// </summary>

View File

@ -15,6 +15,7 @@ namespace SDK
{
public class SDKManager : UnitySingleton<SDKManager>
{
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)

View File

@ -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: []

View File

@ -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: []

View File

@ -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: []

View File

@ -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: []

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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<color=#56F384FF>" .. severArea .. "</color>" .. Language[11713]
.name -- .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. 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<color=#56F384FF>" .. severArea .. "</color>" .. Language[11713]
.name -- .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. 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

View File

@ -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, "|")

View File

@ -6,6 +6,7 @@ using GameCore;
using System.IO;
using GameLogic;
using UnityEngine.Networking;
using SDK;
namespace ResUpdate
{
@ -55,7 +56,7 @@ namespace ResUpdate
/// </summary>
public float totalSizeKB
{
get { return 1f *TotalSize / 1024; }
get { return 1f * TotalSize / 1024; }
}
/// <summary>
@ -201,13 +202,14 @@ namespace ResUpdate
/// <param name="wifi"></param>
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
/// <returns></returns>
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
/// </summary>
void DeleteUnUseFiles(List<ResourceFile> 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
/// <param name="param">参数</param>
void SetResourcesUpdateState(bool isFinish, ResourcesUpdateState state, object param = null)
{
ThreadManager.Instance.QueueOnMainThread(() => {
ThreadManager.Instance.QueueOnMainThread(() =>
{
if (resourcsUpdateAction != null)
{
resourcsUpdateAction(isFinish, state, param);

File diff suppressed because it is too large Load Diff

View File

@ -8,6 +8,7 @@ public class AppWrap
{
L.BeginClass(typeof(App), typeof(GameCore.UnitySingleton<App>));
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<App>(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)
{

View File

@ -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)
{

Binary file not shown.

View File

@ -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