fatiao/ro-webgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UIStoryDate：约会功能

Browse Source
This commit is contained in:
fatiao 2025-11-27 14:39:42 +08:00
parent 686012433f
commit c6948321f0
18 changed files with 569 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Content/Config/LanguagePackageV2_cn.csv
View File

@ -1134,12 +1134,12 @@ AIT6,哥哥，如果送我一点礼物，我会更想哥哥！
AIT7,甚至可以带哥哥来我的闺房坐坐！哥哥想来吗？
AIT8,哥哥哥哥哥哥。。。。。
AIT9,谢谢哥哥，妹妹喜欢！妹妹也送哥哥一点礼物！
AIT10,[giftRewardId-3002]
AIT10,[dateRewardId-3004]
AIT11,哥哥哥哥哥哥。。。。。
AIT12,[giftRewardId-3002]
AIT12,[dateRewardId-3004]
AIT13,哥哥哥哥哥哥。。。。。
AIT14,谢谢哥哥，妹妹喜欢！
AIT15,[giftRewardId-3002]
AIT15,[dateRewardId-3004]
AIT16,哥哥哥哥哥哥。。。。。
AIT17,谢谢哥哥，妹妹喜欢！妹妹也送哥哥一点礼物！
AIT18,[giftRewardId-3002]

1 key 内容
1134 AIT7 甚至可以带哥哥来我的闺房坐坐！哥哥想来吗？
1135 AIT8 哥哥哥哥哥哥。。。。。
1136 AIT9 谢谢哥哥，妹妹喜欢！妹妹也送哥哥一点礼物！
1137 AIT10 [giftRewardId-3002] [dateRewardId-3004]
1138 AIT11 哥哥哥哥哥哥。。。。。
1139 AIT12 [giftRewardId-3002] [dateRewardId-3004]
1140 AIT13 哥哥哥哥哥哥。。。。。
1141 AIT14 谢谢哥哥，妹妹喜欢！
1142 AIT15 [giftRewardId-3002] [dateRewardId-3004]
1143 AIT16 哥哥哥哥哥哥。。。。。
1144 AIT17 谢谢哥哥，妹妹喜欢！妹妹也送哥哥一点礼物！
1145 AIT18 [giftRewardId-3002]

4
Assets/Content/Raw_Art/UI/UIChatMomo/img_chat_gift_bg.png.meta
View File

@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 71, y: 73, z: 79, w: 57}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -139,7 +139,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

BIN
Assets/Content/Raw_Art/UI/UIChatMomo/img_date1_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 KiB

153
Assets/Content/Raw_Art/UI/UIChatMomo/img_date1_icon.png.meta Normal file
View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 7f07016d853d65b4d92564d6a0ae97e2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 45
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Content/Raw_Art/UI/UIChatMomo/img_date2_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 140 KiB

153
Assets/Content/Raw_Art/UI/UIChatMomo/img_date2_icon.png.meta Normal file
View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 19ff3acdad9e9254bbf99c207cbef66a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 45
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Content/Raw_Art/UI/UIChatMomo/img_date3_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 140 KiB

153
Assets/Content/Raw_Art/UI/UIChatMomo/img_date3_icon.png.meta Normal file
View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: dfb13ec045427db4ea44cbada4097eb4
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 45
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

80
Assets/Lua/Config/StoryItemCfg.lua
View File

@ -1,7 +1,7 @@
local StoryItemCfg = {
[1]={
['Id']=1,
['Name']='玫瑰',
['Name']='定制手机壳',
['Icon']='Momo/story_item_1',
['IconSize']='200x200',
['ItemId']=50001,
@ -9,7 +9,7 @@ local StoryItemCfg = {
},
[2]={
['Id']=2,
['Name']='项链',
['Name']='小说集',
['Icon']='Momo/story_item_2',
['IconSize']='200x200',
['ItemId']=50002,
@ -17,7 +17,7 @@ local StoryItemCfg = {
},
[3]={
['Id']=3,
['Name']='香水',
['Name']='许愿绳结手链',
['Icon']='Momo/story_item_3',
['IconSize']='200x200',
['ItemId']=50003,
@ -25,7 +25,7 @@ local StoryItemCfg = {
},
[4]={
['Id']=4,
['Name']='吊坠',
['Name']='幸运项链',
['Icon']='Momo/story_item_4',
['IconSize']='200x200',
['ItemId']=50004,
@ -33,7 +33,7 @@ local StoryItemCfg = {
},
[5]={
['Id']=5,
['Name']='皇冠',
['Name']='滤镜粉底液',
['Icon']='Momo/story_item_5',
['IconSize']='200x200',
['ItemId']=50005,
@ -41,7 +41,7 @@ local StoryItemCfg = {
},
[6]={
['Id']=6,
['Name']='帽子',
['Name']='限量款包包',
['Icon']='Momo/story_item_6',
['IconSize']='200x200',
['ItemId']=50006,
@ -49,7 +49,7 @@ local StoryItemCfg = {
},
[7]={
['Id']=7,
['Name']='手链',
['Name']='龙息辣条',
['Icon']='Momo/story_item_7',
['IconSize']='200x200',
['ItemId']=50007,
@ -57,75 +57,11 @@ local StoryItemCfg = {
},
[8]={
['Id']=8,
['Name']='戒子',
['Name']='表情包布丁',
['Icon']='Momo/story_item_8',
['IconSize']='200x200',
['ItemId']=50008,
['ItemNum']=1,
},
[9]={
['Id']=9,
['Name']='玫瑰2',
['Icon']='Momo/story_item_1',
['IconSize']='200x200',
['ItemId']=50009,
['ItemNum']=1,
},
[10]={
['Id']=10,
['Name']='项链2',
['Icon']='Momo/story_item_2',
['IconSize']='200x200',
['ItemId']=50010,
['ItemNum']=1,
},
[11]={
['Id']=11,
['Name']='香水2',
['Icon']='Momo/story_item_3',
['IconSize']='200x200',
['ItemId']=50011,
['ItemNum']=1,
},
[12]={
['Id']=12,
['Name']='吊坠2',
['Icon']='Momo/story_item_4',
['IconSize']='200x200',
['ItemId']=50012,
['ItemNum']=1,
},
[13]={
['Id']=13,
['Name']='皇冠2',
['Icon']='Momo/story_item_5',
['IconSize']='200x200',
['ItemId']=50013,
['ItemNum']=1,
},
[14]={
['Id']=14,
['Name']='帽子2',
['Icon']='Momo/story_item_6',
['IconSize']='200x200',
['ItemId']=50014,
['ItemNum']=1,
},
[15]={
['Id']=15,
['Name']='手链2',
['Icon']='Momo/story_item_7',
['IconSize']='200x200',
['ItemId']=50015,
['ItemNum']=1,
},
[16]={
['Id']=16,
['Name']='戒子2',
['Icon']='Momo/story_item_8',
['IconSize']='200x200',
['ItemId']=50016,
['ItemNum']=1,
},
}
return StoryItemCfg

1
Assets/Lua/Enum/UIEventNames.lua
View File

@ -594,6 +594,7 @@ local UIEventNames = {
EID_DANMU_INPUT_NTF = id(),
EID_CHAT_STORY_REWARD = id(),
EID_CHAT_STORY_DATE_REWARD = id(),
EID_CHAT_STORY_ADD_HEART_NTF = id(),
}

7
Assets/Lua/Logic/StoryData.lua
View File

@ -122,6 +122,8 @@ function StoryData:RegisterNetEvents()
ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_CHAT_STORY_ADD_HEART_NTF, storyNpcId, heart, addHeart)
elseif storyRewardCfg.RewardType == 2 then
ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_CHAT_STORY_REWARD, data.story_rewards)
elseif storyRewardCfg.RewardType == 3 then
ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_CHAT_STORY_DATE_REWARD, data.story_rewards)
end
end
end)
@ -249,11 +251,12 @@ function StoryData:AddHeart(storyId, rewardId)
ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_ROLE_STORY_NPC_REQ, {story_npc_id = {key = storyId, value = rewardId}})
end
function StoryData:GetSendItemReward(chatId, itemId, itemNum, rewardId)
function StoryData:GetSendItemReward(chatId, itemId, itemNum, rewardId, rewardParam)
rewardParam = rewardParam or ""
self.data.currWaitAckChatId = chatId
self:SetSendItemRewardStatus(chatId, 0)
LogError(Inspect({item_id=itemId, item_num=itemNum, reward_id=rewardId}))
ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_ROLE_GET_SEND_NPC_ITEM_REWARD_REQ, {item_id=itemId, item_num=itemNum, reward_id=rewardId})
ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_ROLE_GET_SEND_NPC_ITEM_REWARD_REQ, {item_id=itemId, item_num=itemNum, reward_id=rewardId, reward_param=rewardParam})
end
function StoryData:SetSendItemRewardStatus(chatId, status)

2
Assets/Lua/Managers/LuaBattleMgr.lua
View File

@ -475,7 +475,7 @@ function LuaBattleMgr:OnBossRewardAck(playerBossRewardAck)
ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIBattleBossBox)
else
--ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIBattleWin)
ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIBattleSuccess)
ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIBattleSuccess, self.rewardItemList)
end
else
-- LogError("----------------OnBattleIncomeAck---- " .. playerBossRewardAck.error)

7
Assets/Lua/Pb/login.txt
View File

@ -1,5 +1,5 @@
©â
Íâ
login.proto serverproto
user.proto"0
@ -995,11 +995,12 @@ storyNpcId"f
SCRoleStoryNpcAck
error (Rerror;
story_npc_id ( 2.serverproto.KeyValueTypeR
storyNpcId"p
storyNpcId"“
CSRoleGetSendNpcItemRewardReq
item_id (RitemId
item_num ( RitemNum
reward_id (RrewardId"Ê
reward_id (RrewardId!
reward_param ( R rewardParam"Ê
SCRoleGetSendNpcItemRewardAck
error (Rerror
reward_id (RrewardId6

24
Assets/Lua/UI/Common/ChatContentItemCtr.lua
View File

@ -249,7 +249,6 @@ function ChatContentItemCtr:SetData(wnd, itemLua, itemData, enterType, onClickOw
LogError("AAA"..Inspect(itemData))
end
if itemData.targetId and string.find(itemData.targetId, "AICHAT_") then
local contentStr = itemData.message.message
local rewardId = contentStr:match("%[giftRewardId%-(%d+)%]")
if ManagerContainer.DataMgr.StoryData:IsGetSendItemReward(itemData.targetId) then
@ -277,7 +276,6 @@ function ChatContentItemCtr:SetData(wnd, itemLua, itemData, enterType, onClickOw
end
-- 3.3 约会消息
elseif itemData.message.subType == Enum.ChatSubType.Date then
itemLua.rectTransform.sizeDelta = Vector2(itemLua.rectTransform.sizeDelta.x, 500)
@ -288,17 +286,25 @@ function ChatContentItemCtr:SetData(wnd, itemLua, itemData, enterType, onClickOw
else
currContentNode = itemLua.rightNode.contentDate
end
currContentNode.rectTransform.sizeDelta = Vector2(400, 400)
--currContentNode.rectTransform.sizeDelta = Vector2(400, 400)
local contentStr = itemData.message.message
local dateId = contentStr:match("%[date%-(%d+)%]")
local iconImageComp = currContentNode.image.image
local iconPath = "Momo/date_"..dateId
CommonUtil.LoadIcon(wnd, iconPath, function(sprite) iconImageComp.sprite = sprite end)
local rewardId = contentStr:match("%[dateRewardId%-(%d+)%]")
if itemData.targetId and string.find(itemData.targetId, "AICHAT_") then
if ManagerContainer.DataMgr.StoryData:IsGetSendItemReward(itemData.targetId) then
currContentNode.mask:SetActive(true)
--currContentNode.subTitle.text.text = I18N.T("已领取")
else
currContentNode.mask:SetActive(false)
--currContentNode.subTitle.text.text = I18N.T("未领取")
onClickOwner.uiBase:AddButtonUniqueEventListener(currContentNode.button, onClickOwner, onClickCB, itemData)
end
end
-- 3.4 图片消息
elseif itemData.message.subType == Enum.ChatSubType.Image then
local offset = 100
local offset = 0
itemLua.rectTransform.sizeDelta = Vector2(itemLua.rectTransform.sizeDelta.x, 800+offset)
itemLua.layoutElement.preferredHeight = 800+offset
local currContentNode
@ -319,7 +325,7 @@ function ChatContentItemCtr:SetData(wnd, itemLua, itemData, enterType, onClickOw
-- 3.5 物品消息
elseif itemData.message.subType == Enum.ChatSubType.Item then
local offset = 100
local offset = 0
itemLua.rectTransform.sizeDelta = Vector2(itemLua.rectTransform.sizeDelta.x, 400+offset)
itemLua.layoutElement.preferredHeight = 400+offset
local currContentNode

73
Assets/Lua/UI/GridViewItem/ChatContentItem_Generate.lua
View File

@ -144,6 +144,7 @@
---@field public title ChatContentItem__Generate_leftNode_contentDate_title
---@field public subTitle ChatContentItem__Generate_leftNode_contentDate_subTitle
---@field public tip ChatContentItem__Generate_leftNode_contentDate_tip
---@field public mask UnityEngine.GameObject
---@class ChatContentItem__Generate_leftNode_contentGift_tip
---@field public gameObject UnityEngine.GameObject
@ -300,6 +301,7 @@ function ChatContentItemView:InitGenerate(Root, data)
self:InitGenerate__50(Root,data)
self:InitGenerate__51(Root,data)
self:InitGenerate__52(Root,data)
self:InitGenerate__53(Root,data)
end
@ -619,6 +621,18 @@ end
---@private
function ChatContentItemView:InitGenerate__24(Root, data)
--[[
LeftNode/ContentDate/Mask
--]]
local tmp = Root:Find("LeftNode/ContentDate/Mask").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.leftNode.contentDate.mask = tmp
end
---@private
function ChatContentItemView:InitGenerate__25(Root, data)
--[[
LeftNode/ContentImage
--]]
@ -632,7 +646,7 @@ function ChatContentItemView:InitGenerate__24(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__25(Root, data)
function ChatContentItemView:InitGenerate__26(Root, data)
--[[
LeftNode/ContentImage/Image
--]]
@ -646,7 +660,7 @@ function ChatContentItemView:InitGenerate__25(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__26(Root, data)
function ChatContentItemView:InitGenerate__27(Root, data)
--[[
LeftNode/ContentItem
--]]
@ -660,7 +674,7 @@ function ChatContentItemView:InitGenerate__26(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__27(Root, data)
function ChatContentItemView:InitGenerate__28(Root, data)
--[[
LeftNode/ContentItem/Image
--]]
@ -674,7 +688,7 @@ function ChatContentItemView:InitGenerate__27(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__28(Root, data)
function ChatContentItemView:InitGenerate__29(Root, data)
--[[
RightNode
--]]
@ -686,7 +700,7 @@ function ChatContentItemView:InitGenerate__28(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__29(Root, data)
function ChatContentItemView:InitGenerate__30(Root, data)
--[[
RightNode/HeadBorder/HeadIconNode
--]]
@ -698,7 +712,7 @@ function ChatContentItemView:InitGenerate__29(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__30(Root, data)
function ChatContentItemView:InitGenerate__31(Root, data)
--[[
RightNode/HeadBorder/HeadIconNode/HeadIcon
--]]
@ -712,7 +726,7 @@ function ChatContentItemView:InitGenerate__30(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__31(Root, data)
function ChatContentItemView:InitGenerate__32(Root, data)
--[[
RightNode/ContentText
--]]
@ -726,7 +740,7 @@ function ChatContentItemView:InitGenerate__31(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__32(Root, data)
function ChatContentItemView:InitGenerate__33(Root, data)
--[[
RightNode/ContentText/ChatText
--]]
@ -740,7 +754,7 @@ function ChatContentItemView:InitGenerate__32(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__33(Root, data)
function ChatContentItemView:InitGenerate__34(Root, data)
--[[
RightNode/ContentHongbao
--]]
@ -754,7 +768,7 @@ function ChatContentItemView:InitGenerate__33(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__34(Root, data)
function ChatContentItemView:InitGenerate__35(Root, data)
--[[
RightNode/ContentHongbao/Icon
--]]
@ -766,7 +780,7 @@ function ChatContentItemView:InitGenerate__34(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__35(Root, data)
function ChatContentItemView:InitGenerate__36(Root, data)
--[[
RightNode/ContentHongbao/Title
--]]
@ -780,7 +794,7 @@ function ChatContentItemView:InitGenerate__35(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__36(Root, data)
function ChatContentItemView:InitGenerate__37(Root, data)
--[[
RightNode/ContentHongbao/SubTitle
--]]
@ -794,7 +808,7 @@ function ChatContentItemView:InitGenerate__36(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__37(Root, data)
function ChatContentItemView:InitGenerate__38(Root, data)
--[[
RightNode/ContentHongbao/Tip
--]]
@ -808,7 +822,7 @@ function ChatContentItemView:InitGenerate__37(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__38(Root, data)
function ChatContentItemView:InitGenerate__39(Root, data)
--[[
RightNode/ContentImage
--]]
@ -822,7 +836,7 @@ function ChatContentItemView:InitGenerate__38(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__39(Root, data)
function ChatContentItemView:InitGenerate__40(Root, data)
--[[
RightNode/ContentImage/Image
--]]
@ -836,7 +850,7 @@ function ChatContentItemView:InitGenerate__39(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__40(Root, data)
function ChatContentItemView:InitGenerate__41(Root, data)
--[[
RightNode/ContentItem
--]]
@ -850,7 +864,7 @@ function ChatContentItemView:InitGenerate__40(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__41(Root, data)
function ChatContentItemView:InitGenerate__42(Root, data)
--[[
RightNode/ContentItem/Image
--]]
@ -864,7 +878,7 @@ function ChatContentItemView:InitGenerate__41(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__42(Root, data)
function ChatContentItemView:InitGenerate__43(Root, data)
--[[
RightNode/ContentDate
--]]
@ -878,7 +892,7 @@ function ChatContentItemView:InitGenerate__42(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__43(Root, data)
function ChatContentItemView:InitGenerate__44(Root, data)
--[[
RightNode/ContentDate/Image
--]]
@ -892,7 +906,7 @@ function ChatContentItemView:InitGenerate__43(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__44(Root, data)
function ChatContentItemView:InitGenerate__45(Root, data)
--[[
RightNode/ContentGift
--]]
@ -908,7 +922,7 @@ function ChatContentItemView:InitGenerate__44(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__45(Root, data)
function ChatContentItemView:InitGenerate__46(Root, data)
--[[
RightNode/ContentGift/Icon
--]]
@ -920,7 +934,7 @@ function ChatContentItemView:InitGenerate__45(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__46(Root, data)
function ChatContentItemView:InitGenerate__47(Root, data)
--[[
RightNode/ContentGift/Title
--]]
@ -934,7 +948,7 @@ function ChatContentItemView:InitGenerate__46(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__47(Root, data)
function ChatContentItemView:InitGenerate__48(Root, data)
--[[
RightNode/ContentGift/SubTitle
--]]
@ -948,7 +962,7 @@ function ChatContentItemView:InitGenerate__47(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__48(Root, data)
function ChatContentItemView:InitGenerate__49(Root, data)
--[[
RightNode/ContentGift/Tip
--]]
@ -962,7 +976,7 @@ function ChatContentItemView:InitGenerate__48(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__49(Root, data)
function ChatContentItemView:InitGenerate__50(Root, data)
--[[
RightNode/ContentGift/Mask
--]]
@ -974,7 +988,7 @@ function ChatContentItemView:InitGenerate__49(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__50(Root, data)
function ChatContentItemView:InitGenerate__51(Root, data)
--[[
CenterNode
--]]
@ -986,7 +1000,7 @@ function ChatContentItemView:InitGenerate__50(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__51(Root, data)
function ChatContentItemView:InitGenerate__52(Root, data)
--[[
CenterNode/ContentText
--]]
@ -1000,7 +1014,7 @@ function ChatContentItemView:InitGenerate__51(Root, data)
end
---@private
function ChatContentItemView:InitGenerate__52(Root, data)
function ChatContentItemView:InitGenerate__53(Root, data)
--[[
CenterNode/ContentText/ChatText
--]]
@ -1096,6 +1110,9 @@ function ChatContentItemView:GenerateDestroy()
if tolua.getpeer(self.leftNode.contentImage) ~= nil then
tolua.setpeer(self.leftNode.contentImage, nil)
end
if tolua.getpeer(self.leftNode.contentDate.mask) ~= nil then
tolua.setpeer(self.leftNode.contentDate.mask, nil)
end
if tolua.getpeer(self.leftNode.contentDate.tip) ~= nil then
tolua.setpeer(self.leftNode.contentDate.tip, nil)
end

2
Assets/Lua/UI/UIChat/UIChatCtr.lua
View File

@ -432,7 +432,7 @@ function UIChatCtr:CheckChatSubType(contentStr, nickname)
end
local patterns = {
[Enum.ChatSubType.Gift] = "%[giftRewardId%-%d+%]",
[Enum.ChatSubType.Date] = "%[date%-%d+%]",
[Enum.ChatSubType.Date] = "%[dateRewardId%-%d+%]",
[Enum.ChatSubType.Image] = "%[photo%-%d+%]",
[Enum.ChatSubType.Item] = "%[itemId%-%d+%]",
[Enum.ChatSubType.Hongbao] = "%[rp%-%d+%]",

11
Assets/Lua/UI/UIChat/UIChatView.lua
View File

@ -75,6 +75,9 @@ function UIChatView:AddEventListener()
LogError("[EID_CHAT_STORY_ADD_HEART_NTF] storyNpcId="..storyNpcId.." heart="..heart.." addHeart="..addHeart)
self:PlayAddHeartAnimation(storyNpcId, heart, addHeart)
end)
ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.EID_CHAT_STORY_DATE_REWARD, function(story_rewards)
self:RefreshChatLayer2(self.currChatChannelId, self.currStoryData)
end)
end
function UIChatView:FillContent(data, uiBase)
@ -1205,6 +1208,14 @@ function UIChatView:OnChatContentItemClicked(button, params)
local itemId, itemNum = self:GetCurrStorySendItem()
ManagerContainer.DataMgr.StoryData:GetSendItemReward(chatId, itemId, itemNum, rewardId)
end
elseif p1.message.subType == Enum.ChatSubType.Date then
local chatId = storyPerformCfgId
local rewardId = tonumber(contentStr:match("%[dateRewardId%-(%d+)%]"))
if ManagerContainer.DataMgr.StoryData:IsGetSendItemReward(storyPerformCfgId) == false then
local itemId, itemNum = self:GetCurrStorySendItem()
LogError("~~GetCurrStorySendItem~~")
ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIStoryDate, {chatId=chatId, itemId=itemId, itemNum=itemNum, rewardId=rewardId})
end
end
end
end

16
Assets/Lua/UI/UIStoryDate/UIStoryDateView.lua
View File

@ -52,6 +52,9 @@ function UIStoryDateView:Init()
self.leftPointTransform = self[gameName].leftPoint.transform
self.rightPointTransform = self[gameName].rightPoint.transform
self.partATransform.position = self.startPointTransform.position
local data = self.controller:GetData()
LogError(Inspect(data))
end
function UIStoryDateView:OnCloseBtn()
@ -63,6 +66,13 @@ function UIStoryDateView:RemoveEventListener()
end
function UIStoryDateView:AddUIEventListener()
ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.EID_CHAT_STORY_DATE_REWARD, function(story_rewards)
local rewards = {}
for k, v in pairs(story_rewards) do
table.insert(rewards, {cfgId = v.key, num = v.value})
end
ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIPOPGot, {rewards = rewards})
end)
end
function UIStoryDateView:OnHide()
@ -110,7 +120,6 @@ end
function UIStoryDateView:AddScore(score)
self.score = self.score + score
LogError(self.score)
end
function UIStoryDateView:OnClickInputBtn()
@ -155,9 +164,12 @@ function UIStoryDateView:OnSecondTick()
end
end
-- {chatId=chatId, itemId=itemId, itemNum=itemNum, rewardId=rewardId}
function UIStoryDateView:OnGameOver()
self:StopGame()
LogError("~~OnGameOver~~")
local rewardParam = "S"
local data = self.controller:GetData()
ManagerContainer.DataMgr.StoryData:GetSendItemReward(data.chatId, data.itemId, data.itemNum, data.rewardId, rewardParam)
end
return UIStoryDateView