dev_chengFeng
parent
266b9065d8
commit
7dea7af830
|
@ -1 +1 @@
|
||||||
{"buglyId":"b67b061643", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "subChannel":"1", "version":"0.15.1", "serverUrl":"http://60.1.1.23:8080/"}
|
{"subChannel":"1", "buglyId":"b67b061643", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.1", "serverUrl":"http://60.1.1.23:8080/"}
|
|
@ -659,6 +659,7 @@ JumpType = {
|
||||||
FiveStarActivity = 10008, --五星成长礼
|
FiveStarActivity = 10008, --五星成长礼
|
||||||
Setting = 10009, --设置界面
|
Setting = 10009, --设置界面
|
||||||
FindFairy = 10010, --东海寻仙
|
FindFairy = 10010, --东海寻仙
|
||||||
|
GuildAid = 10011, --公会援助
|
||||||
}
|
}
|
||||||
YaoHunFrame = {
|
YaoHunFrame = {
|
||||||
--[6] = "r_tongyong_yaohunkuang002",
|
--[6] = "r_tongyong_yaohunkuang002",
|
||||||
|
@ -1176,7 +1177,8 @@ NumToSimplenessFont = {
|
||||||
GLOBAL_CHAT_TYPE = {
|
GLOBAL_CHAT_TYPE = {
|
||||||
COMMON = 0,
|
COMMON = 0,
|
||||||
GUILD_INVITE = 1,
|
GUILD_INVITE = 1,
|
||||||
GUILD_REDPACKET=2
|
GUILD_REDPACKET=2,
|
||||||
|
GUILD_AID=3,
|
||||||
}
|
}
|
||||||
-- 公共聊天记录最大保存数量
|
-- 公共聊天记录最大保存数量
|
||||||
PUBLIC_CHAT_MAX_NUM = 50
|
PUBLIC_CHAT_MAX_NUM = 50
|
||||||
|
|
|
@ -397,7 +397,7 @@ function this.RequestSendGuildAid(itemId1,itemId2,func)
|
||||||
local content = ""
|
local content = ""
|
||||||
if itemId2 then
|
if itemId2 then
|
||||||
content = string.format(
|
content = string.format(
|
||||||
ConfigManager.GetConfigData(ConfigName.ErrorCodeHint,120).Desc,
|
ConfigManager.GetConfigData(ConfigName.ErrorCodeHint,121).Desc,
|
||||||
PlayerManager.nickName,
|
PlayerManager.nickName,
|
||||||
ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId1).Name,
|
ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId1).Name,
|
||||||
tostring(ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).RecourseTime[2]),
|
tostring(ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).RecourseTime[2]),
|
||||||
|
@ -405,14 +405,19 @@ function this.RequestSendGuildAid(itemId1,itemId2,func)
|
||||||
tostring(ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).RecourseTime[2])
|
tostring(ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).RecourseTime[2])
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
|
|
||||||
content = string.format(
|
content = string.format(
|
||||||
ConfigManager.GetConfigData(ConfigName.ErrorCodeHint,121).Desc,
|
ConfigManager.GetConfigData(ConfigName.ErrorCodeHint,120).Desc,
|
||||||
PlayerManager.nickName,
|
PlayerManager.nickName,
|
||||||
ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId1).Name,
|
ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId1).Name,
|
||||||
tostring(ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).RecourseTime[2])
|
tostring(ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).RecourseTime[2])
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
LogError("content "..content)
|
content = string.format(
|
||||||
|
"%d#%s",
|
||||||
|
GLOBAL_CHAT_TYPE.GUILD_AID,
|
||||||
|
content
|
||||||
|
)
|
||||||
-- 发送消息
|
-- 发送消息
|
||||||
NetManager.RequestSendChatMsg(channel, content, 0, function()
|
NetManager.RequestSendChatMsg(channel, content, 0, function()
|
||||||
local msgId = this.GetMsgIdFlag(channel)
|
local msgId = this.GetMsgIdFlag(channel)
|
||||||
|
@ -470,6 +475,8 @@ function this.AnalysisGlobalChat(msg)
|
||||||
chat.nickName=headList[2]
|
chat.nickName=headList[2]
|
||||||
chat.redpackName=headList[3]
|
chat.redpackName=headList[3]
|
||||||
chat.content = string.format("%s 发送了%s,请迅速前往抢夺红包!",chat.nickName,chat.redpackName)
|
chat.content = string.format("%s 发送了%s,请迅速前往抢夺红包!",chat.nickName,chat.redpackName)
|
||||||
|
elseif chat.type==GLOBAL_CHAT_TYPE.GUILD_AID then
|
||||||
|
chat.content = headList[2]
|
||||||
end
|
end
|
||||||
return chat
|
return chat
|
||||||
end
|
end
|
||||||
|
|
|
@ -442,6 +442,10 @@ function this.ChatItemAdapter(node, data, isShowTime)
|
||||||
Util.AddOnceClick(content.gameObject, function() end)
|
Util.AddOnceClick(content.gameObject, function() end)
|
||||||
elseif chat.type == GLOBAL_CHAT_TYPE.GUILD_REDPACKET then
|
elseif chat.type == GLOBAL_CHAT_TYPE.GUILD_REDPACKET then
|
||||||
contentStr=chat.content
|
contentStr=chat.content
|
||||||
|
elseif chat.type == GLOBAL_CHAT_TYPE.GUILD_AID then
|
||||||
|
Util.AddOnceClick(content.gameObject, function()
|
||||||
|
JumpManager.GoJump(72001)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
contentStr = data.msg
|
contentStr = data.msg
|
||||||
|
|
|
@ -55,7 +55,7 @@ function this.SingleHelpAidDataShow(go,data)
|
||||||
Util.GetGameObject(go, "heroPro/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(itemConfig[data.type].Quantity))
|
Util.GetGameObject(go, "heroPro/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(itemConfig[data.type].Quantity))
|
||||||
--Util.GetGameObject(go, "heroPro/frame/icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(itemConfig[data.type].ResourceID))
|
--Util.GetGameObject(go, "heroPro/frame/icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(itemConfig[data.type].ResourceID))
|
||||||
Util.GetGameObject(go, "heroPro/frame/chipImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[data.type].Quantity))
|
Util.GetGameObject(go, "heroPro/frame/chipImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[data.type].Quantity))
|
||||||
LogError("data.name "..data.name)
|
--LogError("data.name "..data.name)
|
||||||
Util.GetGameObject(go, "okAid/chipInfo"):GetComponent("Text").text = data.name
|
Util.GetGameObject(go, "okAid/chipInfo"):GetComponent("Text").text = data.name
|
||||||
Util.GetGameObject(go, "okAid/getAidText"):GetComponent("Text").text = itemConfig[data.type].Name
|
Util.GetGameObject(go, "okAid/getAidText"):GetComponent("Text").text = itemConfig[data.type].Name
|
||||||
Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text = "("..data.num.."/"..guildHelpConfig[1].RecourseTime[2]..")"
|
Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text = "("..data.num.."/"..guildHelpConfig[1].RecourseTime[2]..")"
|
||||||
|
|
|
@ -48,9 +48,11 @@ function this:BindEvent()
|
||||||
if msg.sendMessage then
|
if msg.sendMessage then
|
||||||
ChatManager.RequestSendGuildAid(itemId1,itemId2,function()
|
ChatManager.RequestSendGuildAid(itemId1,itemId2,function()
|
||||||
PopupTipPanel.ShowTip("求助发送成功!")
|
PopupTipPanel.ShowTip("求助发送成功!")
|
||||||
|
MyGuildManager._GuildAidTimeStamp = GetTimeStamp()
|
||||||
end)
|
end)
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip("不可发送援助信息!")
|
MyGuildManager.ShowGuildAidCdTime()
|
||||||
|
--PopupTipPanel.ShowTip("不可发送援助信息!")
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -794,4 +794,15 @@ function MyGuildManager.RefreshAidRedPot()
|
||||||
CheckRedPointStatus(RedPointType.Guild_AidGuild)
|
CheckRedPointStatus(RedPointType.Guild_AidGuild)
|
||||||
CheckRedPointStatus(RedPointType.Guild_AidMy)
|
CheckRedPointStatus(RedPointType.Guild_AidMy)
|
||||||
end
|
end
|
||||||
|
this._GuildAidTimeStamp = 0
|
||||||
|
function MyGuildManager.ShowGuildAidCdTime()
|
||||||
|
-- 判断是否在冷却
|
||||||
|
local _CurTimeStamp = GetTimeStamp()
|
||||||
|
local stampTime = ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).RecourseCD
|
||||||
|
if this._GuildAidTimeStamp and _CurTimeStamp - this._GuildAidTimeStamp < stampTime then
|
||||||
|
local cd = math.floor(stampTime - (_CurTimeStamp - this._GuildAidTimeStamp))
|
||||||
|
PopupTipPanel.ShowTip("操作需间隔"..GetLeftTimeStrByDeltaTime(cd).."钟")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
return this
|
return this
|
||||||
|
|
|
@ -390,6 +390,14 @@ local jumpDic = {
|
||||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION))
|
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION))
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
[JumpType.GuildAid] = function(data)--公会援助
|
||||||
|
if UIManager.IsOpen(UIName.GuildMainCityPanel) then
|
||||||
|
UIManager.OpenPanel(UIName.GuildAidMainPopup,data[1])
|
||||||
|
else
|
||||||
|
UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
||||||
|
UIManager.OpenPanel(UIName.GuildAidMainPopup,data[1])
|
||||||
|
end
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
function this.CheckJump(_jumpId)
|
function this.CheckJump(_jumpId)
|
||||||
|
|
|
@ -56,9 +56,11 @@ function this:BindEvent()
|
||||||
if msg.sendMessage then
|
if msg.sendMessage then
|
||||||
ChatManager.RequestSendGuildAid(itemId1,itemId2,function()
|
ChatManager.RequestSendGuildAid(itemId1,itemId2,function()
|
||||||
PopupTipPanel.ShowTip("求助发送成功!")
|
PopupTipPanel.ShowTip("求助发送成功!")
|
||||||
|
MyGuildManager._GuildAidTimeStamp = GetTimeStamp()
|
||||||
end)
|
end)
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip("不可发送援助信息!")
|
--PopupTipPanel.ShowTip("不可发送援助信息!")
|
||||||
|
MyGuildManager.ShowGuildAidCdTime()
|
||||||
end
|
end
|
||||||
if fun then
|
if fun then
|
||||||
fun()
|
fun()
|
||||||
|
|
Loading…
Reference in New Issue