sdk添加上传新手数据的接口
commit
4f8026425d
|
|
@ -21,6 +21,8 @@ namespace SDK
|
|||
public void PushMessage(Message msg) { lock (messages) { messages.Enqueue(msg); } }
|
||||
public Message PopMessage() { lock (messages) { return messages.Count > 0 ? messages.Dequeue() : null; } }
|
||||
public virtual void CustomEvent(string events,string desc, string type) { }
|
||||
public virtual void NewRoleTutorial(string eventName, string guide_start_time, string guide_end_time, string serverId, string serverName, string roleName, string roleId) { }
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -127,6 +127,13 @@ namespace SDK
|
|||
{
|
||||
currentActivity.Call("CustomEvent", events, desc, type);
|
||||
}
|
||||
|
||||
//sdk新手引导上报
|
||||
public override void NewRoleTutorial(string eventName, string guide_start_time, string guide_end_time, string serverId, string serverName, string roleName, string roleId)
|
||||
{
|
||||
currentActivity.Call("NetRoleTutorial", eventName, guide_start_time, guide_end_time, serverId, serverName, roleName, roleId);
|
||||
}
|
||||
|
||||
//登出
|
||||
public override void Logout()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -72,6 +72,12 @@ namespace SDK
|
|||
{
|
||||
m_SDK_CustomEvent(eventName);
|
||||
}
|
||||
|
||||
|
||||
//sdk新手引导上报
|
||||
public override void NewRoleTutorial(string eventName, string guide_start_time, string guide_end_time, string serverId, string serverName, string roleName, string roleId)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -167,6 +167,12 @@ namespace SDK
|
|||
{
|
||||
proxy.CustomEvent(events, desc, type);
|
||||
}
|
||||
//sdk 新手引导上报
|
||||
public void NewRoleTutorial(string eventName, string guide_start_time, string guide_end_time, string serverId, string serverName, string roleName, string roleId)
|
||||
{
|
||||
proxy.NewRoleTutorial(eventName, guide_start_time, guide_end_time, serverId, serverName, roleName, roleId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// ///////// sdk层回调
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -4377,7 +4377,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 248, y: 644}
|
||||
m_AnchoredPosition: {x: 0, y: 601}
|
||||
m_SizeDelta: {x: 584, y: 84}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7091958631644234883
|
||||
|
|
@ -4408,7 +4408,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 26e7b9b885f7a9d4b8681d2e7ccbd265, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c79ca6ef5a3666c43b6b15a4d3b88f4e, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -4843,10 +4843,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4492904220401090137}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 38}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -25}
|
||||
m_SizeDelta: {x: 140, y: 38}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &4351523970267476369
|
||||
CanvasRenderer:
|
||||
|
|
@ -18517,9 +18517,9 @@ RectTransform:
|
|||
m_Father: {fileID: 4492904220401090137}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 140, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 140, y: -25}
|
||||
m_SizeDelta: {x: 0, y: 50}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &490872853371369416
|
||||
|
|
@ -27994,7 +27994,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -538.24, y: 82}
|
||||
m_SizeDelta: {x: 0, y: 50}
|
||||
m_SizeDelta: {x: 467, y: 50}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &4232190997202796534
|
||||
MonoBehaviour:
|
||||
|
|
@ -29392,10 +29392,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4492904220401090137}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 186, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 38}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 186, y: -25}
|
||||
m_SizeDelta: {x: 281, y: 38}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &5421451615274732876
|
||||
CanvasRenderer:
|
||||
|
|
@ -31190,7 +31190,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6872382260446978439
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -35336,10 +35336,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4492904220401090137}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 140, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 46}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 140, y: -25}
|
||||
m_SizeDelta: {x: 46, y: 46}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &49029013758658618
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -20,7 +20,7 @@ Material:
|
|||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 90460778e185bda4ca37b1b26a085530, type: 3}
|
||||
m_Texture: {fileID: 2800000, guid: 58eb956e62475be41b19de1e6e714b13, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
|
|
|
|||
|
|
@ -764,6 +764,7 @@ RedPointType = {
|
|||
Guild_AidBox = 1049,
|
||||
Guild_Skill = 1050,
|
||||
Guild_DeathPos=1051,
|
||||
Guild_Transcript = 1052,
|
||||
--东海寻仙
|
||||
FindFairy_OneView = 2361,--东海寻仙主界面
|
||||
FindFairy_ThreeView = 2362,--东海寻仙进阶赠礼
|
||||
|
|
@ -1290,6 +1291,7 @@ GUILD_MAP_BUILD_TYPE = {
|
|||
SKILL = 9,--技能
|
||||
CARDELAY = 10,--车迟
|
||||
AID = 11,--援助
|
||||
TRANSCRIPT = 12,--公会副本
|
||||
}
|
||||
-- 公会成员信息界面类型
|
||||
GUILD_MEM_POPUP_TYPE = {
|
||||
|
|
@ -1765,6 +1767,7 @@ RANK_TYPE = {
|
|||
ARENA_RANK=23,-- 竞技场积分排名 前端自己添加
|
||||
XUANYUANMIRROR_RANK=24,-- 竞技场积分排名 前端自己添加
|
||||
FAST_EXPLORE=25,--极速达人排行
|
||||
GUILDTRANSCRIPT=26,--公会排行
|
||||
}
|
||||
|
||||
--东海寻仙弹窗类型
|
||||
|
|
@ -2040,7 +2043,8 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[1
|
|||
[4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||
[5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = false},
|
||||
[6] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12240] ,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = false},
|
||||
[7] = { bgImage = "r_zjm_paihangbang_banner01", name = "极速排名" ,rankType = RANK_TYPE.FAST_EXPLORE,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false},
|
||||
[7] = { bgImage = "r_zjm_paihangbang_banner01", name = "极速排名" ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false},
|
||||
[8] = { bgImage = "r_zjm_paihangbang_banner01", name = "军团副本" ,rankType = RANK_TYPE.GUILDTRANSCRIPT,activiteId = 0,isRankingMainPanelShow = false},
|
||||
}
|
||||
|
||||
SoulPrintSpriteByQuantity={
|
||||
|
|
|
|||
|
|
@ -91,6 +91,18 @@ local type = {
|
|||
tip = string.format("<color=#DB9A9A>%s</color>",specialConfig[76].Value),
|
||||
redPointType = RedPointType.People_Mirror
|
||||
},
|
||||
[3] = {
|
||||
id = FUNCTION_OPEN_TYPE.ENDLESS, --无尽
|
||||
bg = "r_Dungeon_rendi_04",
|
||||
name = "r_Dungeon_xuanyuanbaojing",
|
||||
live = "r_Dungeon_XuanYuan_huli",
|
||||
livePos = Vector2(149, -6.33),
|
||||
liveSize = Vector2(740, 393),
|
||||
tipBg = "r_Dungeon_wujingdian",
|
||||
resetTime = string.format("<color=#DB9A9A>%s</color>",specialConfig[75].Value),
|
||||
tip = string.format("<color=#DB9A9A>%s</color>",specialConfig[76].Value),
|
||||
redPointType = -1
|
||||
},
|
||||
default = {id = -1,bg = "r_Dungeon_rendi_01"}
|
||||
}
|
||||
}
|
||||
|
|
@ -376,6 +388,9 @@ function this.BtnClick(id)
|
|||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.PEOPLE_MIRROR)
|
||||
PopupTipPanel.ShowTip(string.format("玩家等级达到%s级开启",config.OpenRules[2]))
|
||||
end
|
||||
elseif id == FUNCTION_OPEN_TYPE.ENDLESS then
|
||||
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ function EndLessCarbonPanel:BindEvent()
|
|||
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
||||
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
||||
PlayerManager.carbonType = 1
|
||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||
UIManager.OpenPanel(UIName.MainPanel)
|
||||
|
||||
--检测到上一个面板打开之后,关闭自己
|
||||
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
||||
|
|
@ -62,7 +62,6 @@ function EndLessCarbonPanel:BindEvent()
|
|||
end)
|
||||
|
||||
Util.AddClick(this.btnFight, function ()
|
||||
LogGreen("开放的地图ID"..EndLessMapManager.openMapId)
|
||||
this.EnterMap()
|
||||
end)
|
||||
|
||||
|
|
|
|||
|
|
@ -6,18 +6,18 @@ local TabBox = require("Modules/Common/TabBox")
|
|||
this._CurPageIndex =1
|
||||
local orginLayer
|
||||
local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表
|
||||
[1] = { --限时召唤
|
||||
[1] = { --破阵诛仙
|
||||
default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01",
|
||||
rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.Main,
|
||||
},
|
||||
[2] = { --限时召唤
|
||||
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
|
||||
rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,
|
||||
},
|
||||
[2] = { --乾坤宝盒
|
||||
[3] = { --乾坤宝盒
|
||||
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
|
||||
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
|
||||
},
|
||||
[3] = { --破阵诛仙
|
||||
default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01",
|
||||
rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.Main,
|
||||
},
|
||||
[4] = { --珍奇礼包
|
||||
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
|
||||
rpType = "",panelType = PanelType.Main,
|
||||
|
|
@ -47,9 +47,9 @@ function DynamicActivityPanel:InitComponent()
|
|||
this.content = Util.GetGameObject(self.gameObject, "bg/pageContent")
|
||||
|
||||
this.PageList = {
|
||||
[1] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
|
||||
[2] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
|
||||
[3] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
|
||||
[1] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
|
||||
[2] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
|
||||
[3] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
|
||||
[4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
|
||||
[5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
|
||||
[6] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")),
|
||||
|
|
|
|||
|
|
@ -17,14 +17,15 @@ local bgName
|
|||
|
||||
|
||||
local day_picture ={--数字名、文字名、奖励id
|
||||
[1] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,50,0}},
|
||||
[2] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,50,0}},
|
||||
|
||||
[1] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,-470.2,0}},
|
||||
[2] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,-470.2,0}},
|
||||
[3] = {"b_baridenglu_slogan003",2503,"b_baridenglu_slogan03",10022,{1,1,1},{-69,91,0}},
|
||||
[4] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
|
||||
[5] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
|
||||
[6] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
|
||||
[7] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
|
||||
[8] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
|
||||
[4] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-470.2,0}},
|
||||
[5] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-470.2,0}},
|
||||
[6] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-470.2,0}},
|
||||
[7] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-470.2,0}},
|
||||
[8] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-470.2,0}},
|
||||
}
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ function Expert:BindEvent()
|
|||
|
||||
Util.AddClick(this.rewardBtn, function()
|
||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(numExChange[activeIndext])
|
||||
UIManager.OpenPanel(UIName.ExpertRewardSortPanel,activityId,2)
|
||||
UIManager.OpenPanel(UIName.ExpertRewardSortPanel,activityId,2,activeIndext)
|
||||
end)
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ local expertSortDataTabs = {}--排行
|
|||
local expertRewardSortTabs = {}--排行奖励
|
||||
-- 头像对象管理
|
||||
local _PlayerHeadList = {}
|
||||
local activeIndext
|
||||
--初始化组件(用于子类重写)
|
||||
function ExpertRewardSortPanel:InitComponent()
|
||||
|
||||
|
|
@ -58,9 +59,10 @@ function ExpertRewardSortPanel:RemoveListener()
|
|||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function ExpertRewardSortPanel:OnOpen(_activeId,_type)
|
||||
function ExpertRewardSortPanel:OnOpen(_activeId,_type,_activeIndext)
|
||||
activeId = _activeId
|
||||
type = _type
|
||||
activeIndext = _activeIndext
|
||||
--设置信息方法的列表
|
||||
this.SetInfoFuncList ={
|
||||
[FUNCTION_OPEN_TYPE.EXPERT] = this.SetGoldExperSortInfo,
|
||||
|
|
@ -156,9 +158,15 @@ function ExpertRewardSortPanel:ActivitySortRewardShow()
|
|||
self:ActivityRewardSingleShow(expertRewardSortTabs[i],rewardTabs[i])
|
||||
end
|
||||
--
|
||||
RankingManager.InitData(rankKingList[5].rankType, function()
|
||||
this.SetGoldExperSortInfo()
|
||||
end)
|
||||
if activeIndext == 13 then
|
||||
RankingManager.InitData(rankKingList[5].rankType, function()
|
||||
this.SetGoldExperSortInfo()
|
||||
end,ActivityGiftManager.GetActivityIdByType(rankKingList[5].activiteId))
|
||||
elseif activeIndext == 10 then
|
||||
RankingManager.InitData(rankKingList[7].rankType, function()
|
||||
this.SetGoldExperSortInfo()
|
||||
end,ActivityGiftManager.GetActivityIdByType(rankKingList[7].activiteId))
|
||||
end
|
||||
end
|
||||
function this.SetGoldExperSortInfo()
|
||||
local sortNumTabs = {}
|
||||
|
|
|
|||
|
|
@ -69,6 +69,14 @@ local _GuildBuildConfig = {
|
|||
UIManager.OpenPanel(UIName.GuildAidMainPopup)
|
||||
end,
|
||||
},
|
||||
[GUILD_MAP_BUILD_TYPE.TRANSCRIPT] = { --公会副本
|
||||
isOpen = true,
|
||||
rpType = RedPointType.Guild_Transcript,
|
||||
btnName = "btntranscript",
|
||||
btnFunc = function()
|
||||
UIManager.OpenPanel(UIName.GuildTranscriptMainPopup)
|
||||
end,
|
||||
}
|
||||
}
|
||||
local GuildMainCityPanel = Inherit(BasePanel)
|
||||
local this = GuildMainCityPanel
|
||||
|
|
@ -101,7 +109,6 @@ function GuildMainCityPanel:InitComponent()
|
|||
this.btnAttack = Util.GetGameObject(this.rightBox, "attack")
|
||||
this.btnAttackLog = Util.GetGameObject(this.rightBox, "attackLog")
|
||||
this.btnResult = Util.GetGameObject(this.rightBox, "result")
|
||||
this.Transcrip = Util.GetGameObject(this.rightBox, "Transcrip")
|
||||
this.btnRedPacket=Util.GetGameObject(this.rightBox,"redPacket")
|
||||
this.btnRedPacketRedPoint=Util.GetGameObject(this.btnRedPacket,"redPoint")
|
||||
-- 嚣张的头像
|
||||
|
|
@ -206,9 +213,6 @@ function GuildMainCityPanel:BindEvent()
|
|||
UIManager.OpenPanel(UIName.GuildFightResultPopup)
|
||||
end)
|
||||
end)
|
||||
Util.AddClick(this.Transcrip, function()
|
||||
UIManager.OpenPanel(UIName.GuildTranscriptMainPopup)
|
||||
end)
|
||||
--公会红包
|
||||
Util.AddClick(this.btnRedPacket,function()
|
||||
UIManager.OpenPanel(UIName.RedPacketPanel)
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ local cutOpenIndexMonsterConFig
|
|||
local itemList = {}--优化itemView使用
|
||||
local sorting = 0
|
||||
local curBuyIndex = 0
|
||||
this.playerScrollHead={}--滚动条头像
|
||||
--初始化组件(用于子类重写)
|
||||
function GuildTranscriptMainPopup:InitComponent()
|
||||
--btn
|
||||
|
|
@ -40,6 +41,7 @@ function GuildTranscriptMainPopup:InitComponent()
|
|||
this.bossHerohpPass = Util.GetGameObject(this.boss,"hpPass"):GetComponent("Image")
|
||||
this.bossHerohpPassText = Util.GetGameObject(this.boss,"hpText"):GetComponent("Text")
|
||||
--titlechapter
|
||||
this.SelectImage = Util.GetGameObject(self.gameObject, "upChapterGo/SelectImage")
|
||||
local v2 = Util.GetGameObject(self.gameObject, "upChapterGo/upChapter"):GetComponent("RectTransform").rect
|
||||
this.titleScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "upChapterGo/upChapter").transform,
|
||||
Util.GetGameObject(self.gameObject, "upChapterGo/singleChapterPre"), nil, Vector2.New(-v2.x*2, -v2.y*2), 2, 1, Vector2.New(10,10))
|
||||
|
|
@ -49,6 +51,13 @@ function GuildTranscriptMainPopup:InitComponent()
|
|||
this.reward2 = Util.GetGameObject(self.gameObject, "middleGo/rewardGo/reward2")
|
||||
this.Empty = Util.GetGameObject(self.gameObject, "endGo/Empty")
|
||||
Util.GetGameObject(self.gameObject, "endGo/Empty/Bg/Text"):GetComponent("Text").text = "还未有人挑战过此首领"
|
||||
|
||||
--rank
|
||||
local v2New = Util.GetGameObject(self.gameObject, "endGo/rankList"):GetComponent("RectTransform").rect
|
||||
this.rankScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "endGo/rankList").transform,
|
||||
Util.GetGameObject(self.gameObject, "endGo/ItemPre"), nil, Vector2.New(906.8, 545.4), 1, 1, Vector2.New(0,0))
|
||||
this.rankScrollView.moveTween.MomentumAmount = 1
|
||||
this.rankScrollView.moveTween.Strength = 1
|
||||
end
|
||||
--绑定事件(用于子类重写)
|
||||
function GuildTranscriptMainPopup:BindEvent()
|
||||
|
|
@ -223,6 +232,21 @@ function this.ShowTitleChapterInfo()
|
|||
end)
|
||||
this.titleScrollView:SetIndex(cutOpenIndex)
|
||||
end
|
||||
local rankingInfo,myRankingInfo
|
||||
local firstDamage = 0
|
||||
function this.ShowRankingListInfo()
|
||||
rankingInfo,myRankingInfo = RankingManager.GetRankingInfo()
|
||||
LogGreen("#rankingInfo "..#rankingInfo)
|
||||
this.Empty:SetActive(#rankingInfo == 0)
|
||||
Util.GetGameObject(this.gameObject, "endGo/rankList"):SetActive(#rankingInfo ~= 0)
|
||||
if #rankingInfo > 0 then
|
||||
firstDamage = rankingInfo[1].rankInfo.param1
|
||||
end
|
||||
this.rankScrollView :SetData(rankingInfo, function (index, go)
|
||||
this.SingleRankingInfoShow(go, rankingInfo[index])
|
||||
end)
|
||||
this.rankScrollView:SetIndex(1)
|
||||
end
|
||||
function this.SingleChapterDataShow(go,data)
|
||||
Util.GetGameObject(go,"title/Text"):GetComponent("Text").text = data.Remarks
|
||||
local lock = Util.GetGameObject(go,"lock")
|
||||
|
|
@ -243,18 +267,60 @@ function this.SingleChapterDataShow(go,data)
|
|||
lock:SetActive(true)
|
||||
mask:SetActive(true)
|
||||
end
|
||||
if cutOpenIndex == data.Id then
|
||||
this.SetSelectImagePos(go)
|
||||
end
|
||||
Util.AddOnceClick(Util.GetGameObject(go,"click"),function()
|
||||
if data.Id > GuildTranscriptManager.GetCurBoss() then
|
||||
return PopupTipPanel.ShowTip("击败前一个首领方可解锁!")
|
||||
end
|
||||
this.ShowPanelInfo(data.Id)
|
||||
this.SetSelectImagePos(go)
|
||||
end)
|
||||
end
|
||||
|
||||
function this.SingleRankingInfoShow(root,rankData)
|
||||
--排名
|
||||
local rank = rankData.rankInfo.rank
|
||||
local sortNumTabs={}
|
||||
for i = 1, 4 do
|
||||
sortNumTabs[i]=Util.GetGameObject(root,"SortNum/SortNum ("..i..")")
|
||||
sortNumTabs[i]:SetActive(false)
|
||||
end
|
||||
if rank < 4 then
|
||||
sortNumTabs[rank]:SetActive(true)
|
||||
else
|
||||
sortNumTabs[4]:SetActive(true)
|
||||
if rank > 100 then
|
||||
rank="100+"
|
||||
end
|
||||
Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rank
|
||||
end
|
||||
--头像
|
||||
local headObj=Util.GetGameObject(root,"Head")
|
||||
if not this.playerScrollHead[root] then
|
||||
this.playerScrollHead[root]=CommonPool.CreateNode(POOL_ITEM_TYPE.PLAYER_HEAD,headObj)
|
||||
end
|
||||
this.playerScrollHead[root]:Reset()
|
||||
this.playerScrollHead[root]:SetHead(rankData.head)
|
||||
this.playerScrollHead[root]:SetFrame(rankData.headFrame)
|
||||
this.playerScrollHead[root]:SetLevel(rankData.level)
|
||||
this.playerScrollHead[root]:SetScale(Vector3.one*0.7)
|
||||
--
|
||||
Util.GetGameObject(root, "name"):GetComponent("Text").text = rankData.userName
|
||||
Util.GetGameObject(root, "progressbar/progress1"):GetComponent("Image").fillAmount = math.floor((rankData.rankInfo.param1/firstDamage)*100)/100
|
||||
Util.GetGameObject(root, "progressbar/num"):GetComponent("Text").text = rankData.rankInfo.param1--.."/"..firstDamage
|
||||
Util.GetGameObject(root, "SelfBG"):SetActive(PlayerManager.uid == rankData.uid)
|
||||
local clickBtn=Util.GetGameObject(root,"ClickBtn")
|
||||
Util.AddOnceClick(clickBtn,function()
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, rankData.uid)
|
||||
end)
|
||||
end
|
||||
|
||||
function this.ShowPanelInfo(chapterId)
|
||||
cutOpenIndex = chapterId
|
||||
this.ShowQuickBtnData()
|
||||
this.ShowEndNumInfo()
|
||||
cutOpenIndex = chapterId
|
||||
cutOpenIndexConFig = guildCheckpointConfig[cutOpenIndex]
|
||||
cutOpenIndexMonsterConFig =this.GetMonsterConfigDataById(guildCheckpointConfig[cutOpenIndex].MonsterId)
|
||||
this.ShowBossInfo()
|
||||
|
|
@ -269,6 +335,10 @@ function this.ShowQuickBtnData()
|
|||
this.warbtn:GetComponent("Button").enabled = isEqualityChapter
|
||||
Util.SetGray(this.quickWarbtn,not (canSweep and isEqualityChapter))
|
||||
Util.SetGray(this.warbtn,not isEqualityChapter)
|
||||
|
||||
RankingManager.InitData(RANK_TYPE.GUILDTRANSCRIPT,function()
|
||||
this.ShowRankingListInfo()
|
||||
end,cutOpenIndex)
|
||||
end
|
||||
--显示boss立绘信息
|
||||
function this.ShowBossInfo()
|
||||
|
|
@ -315,7 +385,6 @@ function this.ShowRewardInfo()
|
|||
end
|
||||
itemList[this.reward1.name][i].gameObject:SetActive(true)
|
||||
end
|
||||
LogGreen("#reward2Data "..#reward2Data)
|
||||
for i = 1, #reward2Data do
|
||||
if itemList[this.reward2.name][i] then
|
||||
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.6,false,false,false,sorting)
|
||||
|
|
@ -354,11 +423,11 @@ function this.QuickWar()
|
|||
GuildTranscriptManager.GuildChallengeRequest(1,function()
|
||||
this.ShowPanelData()
|
||||
this.ShowEndNumInfo()
|
||||
RankingManager.InitData(RANK_TYPE.GUILDTRANSCRIPT,function()
|
||||
this.ShowRankingListInfo()
|
||||
end,GuildTranscriptManager.GetCurBoss())
|
||||
end)
|
||||
end
|
||||
function this.ShowRanking()
|
||||
this.Empty:SetActive(true)
|
||||
end
|
||||
function this.ShowBuffData()
|
||||
curBuyIndex = GuildTranscriptManager.GetbuffCount()
|
||||
local curguildCheckpointConfig = guildCheckpointConfig[GuildTranscriptManager.GetCurBoss()]
|
||||
|
|
@ -377,9 +446,9 @@ this.timer = Timer.New()
|
|||
--刷新倒计时显示
|
||||
function this.RemainTimeDown(_timeTextExpert,timeDown)
|
||||
if timeDown > 0 then
|
||||
if this.attackInfoTimeGo then
|
||||
this.attackInfoTimeGo:SetActive(true)
|
||||
end
|
||||
-- if this.attackInfoTimeGo then
|
||||
-- this.attackInfoTimeGo:SetActive(true)
|
||||
-- end
|
||||
if _timeTextExpert then
|
||||
_timeTextExpert.text = this.TimeStampToDateString(timeDown)
|
||||
end
|
||||
|
|
@ -392,9 +461,10 @@ function this.RemainTimeDown(_timeTextExpert,timeDown)
|
|||
_timeTextExpert.text = this.TimeStampToDateString(timeDown)
|
||||
end
|
||||
if timeDown < 0 then
|
||||
if this.attackInfoTimeGo then
|
||||
this.attackInfoTimeGo:SetActive(false)
|
||||
end
|
||||
_timeTextExpert.text = ""
|
||||
-- if this.attackInfoTimeGo then
|
||||
-- this.attackInfoTimeGo:SetActive(false)
|
||||
-- end
|
||||
this.timer:Stop()
|
||||
this.timer = nil
|
||||
end
|
||||
|
|
@ -402,11 +472,13 @@ function this.RemainTimeDown(_timeTextExpert,timeDown)
|
|||
end, 1, -1, true)
|
||||
this.timer:Start()
|
||||
else
|
||||
LogGreen("ssssssssss")
|
||||
if this.attackInfoTimeGo then
|
||||
LogGreen("ssssssssss2")
|
||||
this.attackInfoTimeGo:SetActive(false)
|
||||
end
|
||||
|
||||
_timeTextExpert.text = ""
|
||||
-- LogGreen("ssssssssss")
|
||||
-- if this.attackInfoTimeGo then
|
||||
-- LogGreen("ssssssssss2")
|
||||
-- this.attackInfoTimeGo:SetActive(false)
|
||||
-- end
|
||||
end
|
||||
end
|
||||
function this.TimeStampToDateString(second)
|
||||
|
|
@ -416,6 +488,13 @@ function this.TimeStampToDateString(second)
|
|||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
||||
return string.format("(%s:%s:%s:后失效)", hour, minute, sec)
|
||||
end
|
||||
|
||||
function this.SetSelectImagePos(parent)
|
||||
this.SelectImage.transform:SetParent(Util.GetGameObject(parent, "GameObject").transform)
|
||||
this.SelectImage:GetComponent("RectTransform").localPosition = Vector3.zero
|
||||
this.SelectImage:GetComponent("RectTransform").localScale = Vector3.New(1,1,1)
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function GuildTranscriptMainPopup:OnClose()
|
||||
end
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ function this.GuildChallengeRequest(attackType,callBack)
|
|||
canSweep = 1
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权
|
||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.GuildTranscript, callBack)
|
||||
CheckRedPointStatus(RedPointType.Guild_Transcript)
|
||||
end)
|
||||
elseif attackType == 1 then--快速战斗 扫荡
|
||||
NetManager.GuildChallengeRequest(this.GetCurBoss(),attackType,function (msg)
|
||||
|
|
@ -53,6 +54,7 @@ function this.GuildChallengeRequest(attackType,callBack)
|
|||
callBack()
|
||||
end
|
||||
end, 6,true,true)
|
||||
CheckRedPointStatus(RedPointType.Guild_Transcript)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -73,14 +73,14 @@ local _GuildBuildConfig = {
|
|||
rpType = RedPointType.Guild_Skill,
|
||||
rpPos = Vector3.New(53, 137, 0),
|
||||
},
|
||||
-- [GUILD_MAP_BUILD_TYPE.CARDELAY] = { --车迟斗法
|
||||
-- bgImg = "r_gonghui_qizhi",
|
||||
-- nameImg = "r_gonghui_chechidoufa",
|
||||
-- pos = Vector3.New(2626, -761, 0),
|
||||
-- namePos = Vector3.New(0, 13.4, 0),
|
||||
-- rpType = RedPointType.Guild_CarDeleay,
|
||||
-- rpPos = Vector3.New(53, 137, 0),
|
||||
-- },
|
||||
[GUILD_MAP_BUILD_TYPE.BOSS] = { --公会副本
|
||||
bgImg = "r_gonghui_qizhi",
|
||||
nameImg = "r_gonghui_zhao",
|
||||
pos = Vector3.New(266, -158, 0),
|
||||
namePos = Vector3.New(0, 13.4, 0),
|
||||
rpType = RedPointType.Guild_Transcript,
|
||||
rpPos = Vector3.New(53, 137, 0),
|
||||
},
|
||||
[GUILD_MAP_BUILD_TYPE.AID] = { --援助
|
||||
bgImg = "r_gonghui_qizhi",
|
||||
nameImg = "r_gonghui_yuanzhu",
|
||||
|
|
|
|||
|
|
@ -196,6 +196,7 @@ function this:InitComponent()
|
|||
|
||||
-- 无尽
|
||||
this.btnEndLess = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnEndLess")
|
||||
this.btnEndLess:SetActive(false)
|
||||
|
||||
-- 设置
|
||||
--this.btnSet = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnSetting")
|
||||
|
|
@ -230,7 +231,7 @@ function this:InitComponent()
|
|||
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200),
|
||||
--[FUNCTION_OPEN_TYPE.HAND_BOOK] = this:AddFuncItem(this.btnTujian,-2715),
|
||||
[FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200),
|
||||
[FUNCTION_OPEN_TYPE.TRIAL] = this:AddFuncItem(this.btnColorfulWorld, -1000),
|
||||
[FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1000),
|
||||
-- [FUNCTION_OPEN_TYPE.MONSTER_COMING] = this:AddFuncItem(this.btnMonster, -110),
|
||||
-- [FUNCTION_OPEN_TYPE.EXPEDITION] = this:AddFuncItem(this.btnExpedition, -110),
|
||||
[FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200),
|
||||
|
|
@ -655,11 +656,11 @@ function this:BindEvent()
|
|||
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ARENA)
|
||||
end)
|
||||
Util.AddClick(this.btnColorfulWorld, function()
|
||||
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.TRIAL) then
|
||||
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.ENDLESS) then
|
||||
PlayerManager.carbonType = 2
|
||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||
else
|
||||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.TRIAL)
|
||||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS)
|
||||
PopupTipPanel.ShowTip(string.format("玩家等级达到%s级开启",config.OpenRules[2]))
|
||||
end
|
||||
end)
|
||||
|
|
@ -705,10 +706,10 @@ function this:BindEvent()
|
|||
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ALLRANKING)
|
||||
end)
|
||||
|
||||
Util.AddClick(this.btnEndLess, function()
|
||||
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||
end)
|
||||
-- Util.AddClick(this.btnEndLess, function()
|
||||
-- MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
-- UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||
-- end)
|
||||
-- Util.AddClick(this.btnGuanxing, function()
|
||||
-- JumpManager.GoJump(1024)
|
||||
-- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ASPECT_STAR)
|
||||
|
|
|
|||
|
|
@ -121,13 +121,16 @@ function this:topBar()
|
|||
local lv = QinglongSerectTreasureManager.GetLevel()
|
||||
this.lv.text = lv
|
||||
local rewardData = QinglongSerectTreasureManager.GetRewardData(lv)
|
||||
local lastRewardData = QinglongSerectTreasureManager.GetRewardData(lv)
|
||||
if lv ~= 0 then
|
||||
lastRewardData = QinglongSerectTreasureManager.GetRewardData(lv - 1)
|
||||
local needScore
|
||||
if lv > 0 then
|
||||
local lastRewardData = QinglongSerectTreasureManager.GetRewardData(lv - 1)
|
||||
needScore = lastRewardData.needScore
|
||||
else
|
||||
needScore = 0
|
||||
end
|
||||
if rewardData.needScore ~= 0 then
|
||||
this.scoreText.text = curScore .."/"..rewardData.needScore - lastRewardData.needScore
|
||||
this.progress.fillAmount = curScore/(rewardData.needScore - lastRewardData.needScore)
|
||||
this.scoreText.text = curScore .."/"..rewardData.needScore - needScore
|
||||
this.progress.fillAmount = curScore/(rewardData.needScore - needScore)
|
||||
else
|
||||
this.scoreText.text = "最大等级"
|
||||
this.progress.fillAmount = 1
|
||||
|
|
@ -143,7 +146,7 @@ function this:topBar()
|
|||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.QinglongSerectTreasureBuyLevel)
|
||||
end)
|
||||
local times = PrivilegeManager.GetPrivilegeRemainValue(1007)
|
||||
this.box :GetComponent("Image").enabled = ((not (treasureState == 0)) and (times > 0))
|
||||
this.box :GetComponent("Image").enabled = (treasureState == 0)
|
||||
this.extra:GetComponent("Button").enabled = ((not (treasureState == 0)) and (times > 0))
|
||||
this.canOpenExtra.gameObject:SetActive((not (treasureState == 0)) and (times > 0))
|
||||
this.openExtra:GetComponent("Animator").enabled = false
|
||||
|
|
@ -160,6 +163,7 @@ function this:topBar()
|
|||
Timer.New(function()
|
||||
NetManager.GetActivityRewardRequest(-2,QinglongSerectTreasureManager.activityId,function(msg)
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1)
|
||||
PopupTipPanel.ShowTip("成功领取"..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name)
|
||||
this.refresh()
|
||||
end)
|
||||
end,1.5):Start()
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ function this:SetTopBar()
|
|||
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
|
||||
NetManager.GetActivityRewardRequest(-2,id,function(msg)
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1)
|
||||
PopupTipPanel.ShowTip("成功领取"..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name)
|
||||
this.refresh(curType)
|
||||
end)
|
||||
end,1.5):Start()
|
||||
|
|
@ -186,6 +187,7 @@ function this:SingleTask(go, rewardSingleData)
|
|||
Util.AddOnceClick(lingquButton, function()
|
||||
if state == 1 then
|
||||
NetManager.TakeMissionRewardRequest(TaskTypeDef.TreasureOfSomeBody,sConFigData.id, function(msg)
|
||||
PopupTipPanel.ShowTip("成功领取"..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name)
|
||||
Timer.New(function()
|
||||
this.refresh(curType)
|
||||
end,1):Start()
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@ function this.InitRedPointAllRelate()
|
|||
RPData:SetParent(RedPointType.Guild_AidMy, RedPointType.Guild_Aid)
|
||||
RPData:SetParent(RedPointType.Guild_AidGuild, RedPointType.Guild_Aid)
|
||||
RPData:SetParent(RedPointType.Guild_AidBox, RedPointType.Guild_Aid)
|
||||
RPData:SetParent(RedPointType.Guild_Transcript, RedPointType.Guild)
|
||||
RPData:SetParent(RedPointType.Guild_Skill, RedPointType.Guild)
|
||||
RPData:SetParent(RedPointType.Guild_DeathPos, RedPointType.Guild)
|
||||
|
||||
|
|
@ -277,6 +278,7 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.Shop_Roam_Check, ShopManager.ShopRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.Shop_Guild_Check, ShopManager.ShopRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.Guild_Shop, ShopManager.ShopRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.Guild_Transcript, GuildTranscriptManager.GetRedPointState)
|
||||
RPData:AddCheckFunc(RedPointType.VIP_SHOP_DETAIL, VipManager.CheckRedPoint)
|
||||
RPData:AddCheckFunc(RedPointType.VipPrivilege, VipManager.CheckNewVipRP)
|
||||
RPData:AddCheckFunc(RedPointType.GrowthGift, OperatingManager.GetGrowthRedPointState)
|
||||
|
|
|
|||
|
|
@ -11,10 +11,11 @@ end
|
|||
|
||||
|
||||
--初始化排行数据(待优化)
|
||||
function this.InitData(rankType,fun)
|
||||
function this.InitData(rankType,fun,id)
|
||||
local activiteId = (id ~= nil and id > 0) and id or nil--点金时需要 当为公会副本是为章节id
|
||||
NetManager.RequestRankInfo(rankType, function (msg)--请求数据
|
||||
this.ReceiveRankingData(msg,fun)
|
||||
end,0)
|
||||
end,activiteId)
|
||||
end
|
||||
|
||||
---战力战力
|
||||
|
|
|
|||
|
|
@ -105,9 +105,10 @@ end
|
|||
function this.GetRankInfo(rankType)
|
||||
RankingManager.CurPage=0
|
||||
this.istop=true
|
||||
local curActivity = sData.activiteId > 0 and ActivityGiftManager.GetActivityIdByType(sData.activiteId) or nil
|
||||
RankingManager.InitData(rankType,function()
|
||||
this.SetRankingInfo()
|
||||
end)
|
||||
end,curActivity)
|
||||
end
|
||||
|
||||
---设置排名信息
|
||||
|
|
@ -357,6 +358,11 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
|||
end
|
||||
Util.GetGameObject(go,"goldExper/Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||
end
|
||||
if sData.activiteId == ActivityTypeDef.GoldExper then
|
||||
goldExper:GetComponent("Text").text = "点金次数"
|
||||
elseif sData.activiteId == ActivityTypeDef.FastExplore then
|
||||
goldExper:GetComponent("Text").text = "极速次数"
|
||||
end
|
||||
elseif rankType == RANK_TYPE.ARENA_RANK then
|
||||
-- if data.personInfo.score and data.personInfo.score > 0 then
|
||||
arenaScore:SetActive(true)
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
//const char *SDK_SUCCESS = "1";
|
||||
//const char *SDK_FAILED = "0";
|
||||
//
|
||||
//// 猕猴桃sdk参数
|
||||
//const NSString *SDK_AppId = @"98ea7849bb70a99025dfc58b5f57762b";
|
||||
//const NSString *SDK_ChannelId = @"MHT";
|
||||
//
|
||||
//// Flyer 参数
|
||||
//const NSString *SDK_FlyerDevKey = @"ikX5vSJM9ELLcwSEDGHqUX";
|
||||
//const NSString *SDK_FlyerAppId = @"1526261404";
|
||||
//
|
||||
//
|
||||
////Adjust 初始化
|
||||
//const NSString *SDK_ADJAppToken = @"h587d8fzky68";
|
||||
///*
|
||||
// @"production" 正式
|
||||
// @"sandbox" 测试
|
||||
//*/
|
||||
//const NSString *SDK_ADJEnvironment = @"sandbox";
|
||||
|
||||
#define SDK_SUCCESS "1"
|
||||
#define SDK_FAILED "0"
|
||||
|
||||
#define SDK_AppId @"98ea7849bb70a99025dfc58b5f57762b"
|
||||
#define SDK_ChannelId @"MHT"
|
||||
|
||||
#define SDK_FlyerDevKey @"ikX5vSJM9ELLcwSEDGHqUX"
|
||||
#define SDK_FlyerAppId @"1526261404"
|
||||
|
||||
#define SDK_ADJAppToken @"h587d8fzky68"
|
||||
#define SDK_ADJEnvironment @"sandbox"
|
||||
|
|
@ -1,229 +0,0 @@
|
|||
//
|
||||
// ViewController.m
|
||||
// MHTSDKTest
|
||||
//
|
||||
// Created by leigang on 2018/3/4.
|
||||
// Copyright © 2018年 gang. All rights reserved.
|
||||
//
|
||||
|
||||
//#import "SDkLogic.h"
|
||||
//#import <AbroadMhtSdk/AbroadMhtSdk.h>
|
||||
//#import <StoreKit/StoreKit.h>
|
||||
//#import <FBSDKLoginKit/FBSDKLoginKit.h>
|
||||
//
|
||||
//#import <FBSDKCoreKit/FBSDKCoreKit.h>
|
||||
//#import <FBSDKShareKit/FBSDKShareKit.h>
|
||||
//
|
||||
//#import <CommonCrypto/CommonDigest.h>//openUDID
|
||||
//
|
||||
//#import <AuthenticationServices/AuthenticationServices.h>
|
||||
//#import <objc/runtime.h>
|
||||
//
|
||||
//#import <AppsFlyerLib/AppsFlyerTracker.h>
|
||||
//
|
||||
//#import "Adjust.h"
|
||||
|
||||
//@import FirebaseAnalytics;
|
||||
|
||||
//必不可少的地方,Unity调用ios方法会在此处查询方法名,
|
||||
//[DllImport("__Internal")]
|
||||
//private static extern void viewDidLoad();
|
||||
//Unity端固定写法:viewDidLoad 与下文中 viewDidLoad 一一对应;
|
||||
#if defined (__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
void m_SDK_Init()
|
||||
{
|
||||
/*
|
||||
初始化接口
|
||||
AppId:猕猴桃平台分配给用户的AppId
|
||||
channelId:MHT(默认)
|
||||
*/
|
||||
// [[AbroadMhtSdkCreater shareManager]mhtSdkCreateAppid:(NSString *)SDK_AppId channelId:(NSString *)SDK_ChannelId successBlock:^(NSString * _Nullable code) {
|
||||
//
|
||||
// NSLog(@"-初始化返回状态:--%@",code);
|
||||
// if([code isEqual: @"200"]){
|
||||
// UnitySendMessage("SDK.SDKManager", "InitCallback", SDK_SUCCESS);
|
||||
// }else{
|
||||
// UnitySendMessage("SDK.SDKManager", "InitCallback", SDK_FAILED);
|
||||
// }
|
||||
// }];
|
||||
|
||||
}
|
||||
|
||||
void m_SDK_Login()
|
||||
{
|
||||
/*
|
||||
登录接口
|
||||
*/
|
||||
// [[AbroadMhtSdkCreater shareManager]mhtLoginWithCompletionBlock:^(NSString * _Nullable code, NSString * _Nullable token, NSString * _Nullable uid) {
|
||||
// /*
|
||||
// 登录结果回调
|
||||
// */
|
||||
// NSLog(@"登录状态code:%@ token:%@ uid:%@",code,token,uid);
|
||||
// if([code isEqual: @"200"]){
|
||||
// UnitySendMessage("SDK.SDKManager", "LoginCallback", [[NSString stringWithFormat:@"%s#%@#%@#%@#%@",SDK_SUCCESS,uid,token,token,SDK_ChannelId] UTF8String]);
|
||||
// }else{
|
||||
// UnitySendMessage("SDK.SDKManager", "LoginCallback", SDK_FAILED);
|
||||
// }
|
||||
//
|
||||
// } andCompletionBlock:^(NSString * _Nullable code) {
|
||||
//
|
||||
// /*
|
||||
// 登出结果回调
|
||||
// */
|
||||
// NSLog(@"退出状态haha:%@",code);
|
||||
// if([code isEqual: @"200"]){
|
||||
// UnitySendMessage("SDK.SDKManager", "LogoutCallback", SDK_SUCCESS);
|
||||
// }else{
|
||||
// UnitySendMessage("SDK.SDKManager", "LogoutCallback", SDK_FAILED);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// }];
|
||||
}
|
||||
|
||||
void m_SDK_Logout()
|
||||
{
|
||||
/*
|
||||
退出接口
|
||||
rootVC : 当前视图的控制器
|
||||
*/
|
||||
// [[AbroadMhtSdkCreater shareManager]mhtLogoutWithCompletionBlock:^(NSString * _Nullable code) {
|
||||
// NSLog(@"-退出监听:%@",code);
|
||||
// if([code isEqual: @"200"]){
|
||||
// UnitySendMessage("SDK.SDKManager", "LogoutCallback", SDK_SUCCESS);
|
||||
// }else{
|
||||
// UnitySendMessage("SDK.SDKManager", "LogoutCallback", SDK_FAILED);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// }];
|
||||
}
|
||||
|
||||
void m_SDK_SwitchLogin()
|
||||
{
|
||||
|
||||
}
|
||||
void m_SDK_SubmitExtraData(NSString *areaName, NSString *roleName, NSString *roleGrade)
|
||||
{
|
||||
/*
|
||||
设置角色信息模型
|
||||
areaName : 区服id
|
||||
appRoleName : 角色名称
|
||||
appRoleGrade: 角色等级
|
||||
*/
|
||||
// MHTSDKRoleData * roleData = [[MHTSDKRoleData alloc]initWithAreaName:areaName appRoleName:roleName appRoleGrade:roleGrade];
|
||||
// /*
|
||||
// 设置角色接口
|
||||
// rootVC : 当前视图控制器
|
||||
// roleData : 以上建立的MHTSDKRoleData数据模型
|
||||
// */
|
||||
//
|
||||
// [[AbroadMhtSdkCreater shareManager]mhtSetRoleDataWithRoleData:roleData CompletionBlock:^(NSString * _Nullable code) {
|
||||
// NSLog(@"设置角色接口返回:%@",code);
|
||||
// }];
|
||||
|
||||
|
||||
}
|
||||
void m_SDK_Pay(NSString *money, NSString *detail, NSString *csId, NSString *csName, NSString *pid)
|
||||
{
|
||||
/*
|
||||
设置支付数据模型
|
||||
moneyAmt : 支付金额
|
||||
orderDetail : 订单详情
|
||||
consumerId : 游戏玩家标记id
|
||||
consumerName: 游戏玩家标记名称
|
||||
productId : 商品id(计费点)
|
||||
*/
|
||||
// MHTSDKPay * sdkPay = [[MHTSDKPay alloc]initMhtPayModelWithPayMoney:money orderDetail:detail consumerId:csId consumerName:csName productId:pid];
|
||||
//
|
||||
// NSLog(@"计费点:%@",pid);
|
||||
|
||||
/*
|
||||
IAP 苹果内购-调起支付
|
||||
rootVC : 当前视图的控制器
|
||||
pay : 以上设置的支付数据模型
|
||||
*/
|
||||
|
||||
// [[AbroadMhtSdkCreater shareManager]mhtPayByStoreIAPWithPay:sdkPay withIAPCompletionBlock:^(int code) {
|
||||
// NSLog(@"内购状态:%d",code);
|
||||
// switch (code) {
|
||||
// case 200://成功
|
||||
// {
|
||||
// NSLog(@"内购支付成功");
|
||||
//
|
||||
// UnitySendMessage("SDK.SDKManager", "PayCallback", SDK_SUCCESS);
|
||||
//
|
||||
// }
|
||||
// break;
|
||||
// case 301://取消
|
||||
// {
|
||||
// NSLog(@"取消等操作 - 交易取消");
|
||||
// UnitySendMessage("SDK.SDKManager", "PayCallback", SDK_FAILED);
|
||||
//
|
||||
// }
|
||||
// break;
|
||||
// case 302://重复操作
|
||||
// {
|
||||
// NSLog(@"重复购买");
|
||||
// UnitySendMessage("SDK.SDKManager", "PayCallback", SDK_FAILED);
|
||||
//
|
||||
// }
|
||||
// break;
|
||||
// case 303://中断
|
||||
// {
|
||||
// NSLog(@"被其他操作中断");
|
||||
// UnitySendMessage("SDK.SDKManager", "PayCallback", SDK_FAILED);
|
||||
//
|
||||
// }
|
||||
// break;
|
||||
// case 304://验证失败
|
||||
// {
|
||||
// NSLog(@"二次验证失败");
|
||||
// UnitySendMessage("SDK.SDKManager", "PayCallback", SDK_FAILED);
|
||||
//
|
||||
//
|
||||
// }
|
||||
// break;
|
||||
// case 305://计费点无效
|
||||
// {
|
||||
// NSLog(@"计费点无效");
|
||||
// UnitySendMessage("SDK.SDKManager", "PayCallback", SDK_FAILED);
|
||||
//
|
||||
// }
|
||||
// break;
|
||||
// case 500://网络连接问题
|
||||
// {
|
||||
// NSLog(@"网络连接失败");
|
||||
// UnitySendMessage("SDK.SDKManager", "PayCallback", SDK_FAILED);
|
||||
//
|
||||
// }
|
||||
// break;
|
||||
// default:
|
||||
// UnitySendMessage("SDK.SDKManager", "PayCallback", SDK_FAILED);
|
||||
// break;
|
||||
// }
|
||||
// }];
|
||||
}
|
||||
|
||||
|
||||
void m_SDK_CustomEvent(NSString *eventName)
|
||||
{
|
||||
// NSLog(@"sdk 打点:%@",eventName);
|
||||
// /*
|
||||
// 在初始化后,可自定义上报统计事件;可以完成在facebook、firebase以及appsflyer等统计平台的事件上报。
|
||||
// */
|
||||
// [[AbroadMhtSdkCreater shareManager]gameCustomburyPointWithEventName:eventName];
|
||||
|
||||
}
|
||||
|
||||
void m_SDK_Exit()
|
||||
{
|
||||
// NSLog(@"退出游戏");
|
||||
}
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5a4fc6257f0c94e4199395576904dca7
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
isExplicitlyReferenced: 0
|
||||
platformData:
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
DefaultValueInitialized: true
|
||||
- first:
|
||||
iPhone: iOS
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
AddToEmbeddedBinaries: false
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -29,6 +29,7 @@ public class GameLogic_AppConstWrap
|
|||
L.RegVar("GameFrameRate", get_GameFrameRate, set_GameFrameRate);
|
||||
L.RegVar("Channel_ID", get_Channel_ID, set_Channel_ID);
|
||||
L.RegVar("PIXELTOWORLD", get_PIXELTOWORLD, set_PIXELTOWORLD);
|
||||
L.RegVar("EncyptBytesLength", get_EncyptBytesLength, set_EncyptBytesLength);
|
||||
L.RegVar("DOWNLOAD_URL_FORMAT", get_DOWNLOAD_URL_FORMAT, null);
|
||||
L.RegVar("Platform", get_Platform, set_Platform);
|
||||
L.RegVar("PersistentDataPath", get_PersistentDataPath, set_PersistentDataPath);
|
||||
|
|
@ -393,6 +394,20 @@ public class GameLogic_AppConstWrap
|
|||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int get_EncyptBytesLength(IntPtr L)
|
||||
{
|
||||
try
|
||||
{
|
||||
LuaDLL.tolua_pushuint64(L, GameLogic.AppConst.EncyptBytesLength);
|
||||
return 1;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int get_DOWNLOAD_URL_FORMAT(IntPtr L)
|
||||
{
|
||||
|
|
@ -1462,6 +1477,21 @@ public class GameLogic_AppConstWrap
|
|||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int set_EncyptBytesLength(IntPtr L)
|
||||
{
|
||||
try
|
||||
{
|
||||
ulong arg0 = LuaDLL.tolua_checkuint64(L, 2);
|
||||
GameLogic.AppConst.EncyptBytesLength = arg0;
|
||||
return 0;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int set_Platform(IntPtr L)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -10,14 +10,15 @@ public class SDK_SDKManagerWrap
|
|||
L.RegFunction("Initialize", Initialize);
|
||||
L.RegFunction("Init", Init);
|
||||
L.RegFunction("Login", Login);
|
||||
L.RegFunction("Logout", Logout);
|
||||
L.RegFunction("SubmitExtraData", SubmitExtraData);
|
||||
L.RegFunction("Pay", Pay);
|
||||
L.RegFunction("IsSupportExit", IsSupportExit);
|
||||
L.RegFunction("ExitGame", ExitGame);
|
||||
L.RegFunction("GetPayOrderID", GetPayOrderID);
|
||||
L.RegFunction("CaptureShot", CaptureShot);
|
||||
L.RegFunction("Logout", Logout);
|
||||
L.RegFunction("CustomEvent", CustomEvent);
|
||||
L.RegFunction("NewRoleTutorial", NewRoleTutorial);
|
||||
L.RegFunction("InitCallback", InitCallback);
|
||||
L.RegFunction("RegisterCallback", RegisterCallback);
|
||||
L.RegFunction("LoginCallback", LoginCallback);
|
||||
|
|
@ -90,6 +91,22 @@ public class SDK_SDKManagerWrap
|
|||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int Logout(IntPtr L)
|
||||
{
|
||||
try
|
||||
{
|
||||
ToLua.CheckArgsCount(L, 1);
|
||||
SDK.SDKManager obj = (SDK.SDKManager)ToLua.CheckObject<SDK.SDKManager>(L, 1);
|
||||
obj.Logout();
|
||||
return 0;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int SubmitExtraData(IntPtr L)
|
||||
{
|
||||
|
|
@ -190,6 +207,25 @@ public class SDK_SDKManagerWrap
|
|||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int CustomEvent(IntPtr L)
|
||||
{
|
||||
try
|
||||
{
|
||||
ToLua.CheckArgsCount(L, 4);
|
||||
SDK.SDKManager obj = (SDK.SDKManager)ToLua.CheckObject<SDK.SDKManager>(L, 1);
|
||||
string arg0 = ToLua.CheckString(L, 2);
|
||||
string arg1 = ToLua.CheckString(L, 3);
|
||||
string arg2 = ToLua.CheckString(L, 4);
|
||||
obj.CustomEvent(arg0, arg1, arg2);
|
||||
return 0;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int NewRoleTutorial(IntPtr L)
|
||||
{
|
||||
|
|
@ -213,40 +249,6 @@ public class SDK_SDKManagerWrap
|
|||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int Logout(IntPtr L)
|
||||
{
|
||||
try
|
||||
{
|
||||
ToLua.CheckArgsCount(L, 1);
|
||||
SDK.SDKManager obj = (SDK.SDKManager)ToLua.CheckObject<SDK.SDKManager>(L, 1);
|
||||
obj.Logout();
|
||||
return 0;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int CustomEvent(IntPtr L)
|
||||
{
|
||||
try
|
||||
{
|
||||
ToLua.CheckArgsCount(L, 3);
|
||||
SDK.SDKManager obj = (SDK.SDKManager)ToLua.CheckObject<SDK.SDKManager>(L, 1);
|
||||
string arg0 = ToLua.CheckString(L, 2);
|
||||
string arg1 = ToLua.CheckString(L, 3);
|
||||
obj.CustomEvent(arg0, arg1);
|
||||
return 0;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int InitCallback(IntPtr L)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue