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

Compare commits

base: fatiao:7b1f81fc2f89490e292cd4b50417dc6f1e05030c
Branches Tags
fatiao:master
fatiao:game
fatiao:game-unitysdk
fatiao:game-google
fatiao:bblgl-c106
fatiao:csui
...
compare: fatiao:009aec5a26bc05c0236d0d405ac45ea6ffdbed30
Branches Tags
fatiao:game
fatiao:game-unitysdk
fatiao:game-google
fatiao:bblgl-c106
fatiao:csui
fatiao:master

4 Commits
7b1f81fc2f ... 009aec5a26

Author SHA1 Message Date
fatiao
009aec5a26 Merge branch 'game' of http://127.0.0.1:3000/fatiao/ro-webgl into game 2026-02-03 21:05:22 +08:00
fatiao
69b0fcc1cb UIChat：礼物替换 2026-02-03 21:04:51 +08:00
fatiao
485ba69e85 更新图标 2026-02-03 20:06:47 +08:00
fatiao
15c80674c6 直播间显示礼物名称 2026-02-03 16:42:21 +08:00
22 changed files with 75 additions and 66 deletions
Show Stats Expand all files Collapse all files

BIN
Assets/Content/Icons/Items/liveroom_coin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 378 KiB

8
Assets/Content/Icons/Items/liveroom_coin.png.meta
View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -82,7 +82,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 1
@ -95,7 +95,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
@ -121,7 +121,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 47
textureCompression: 1

BIN
Assets/Content/Icons/Items/story_item_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 220 KiB

12
Assets/Content/Icons/Items/story_item_1.png.meta
View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -82,9 +82,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 10
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -95,7 +95,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
@ -121,9 +121,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 45
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

BIN
Assets/Content/Icons/Items/story_item_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 254 KiB

12
Assets/Content/Icons/Items/story_item_2.png.meta
View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -82,9 +82,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 10
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -95,7 +95,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
@ -121,9 +121,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 45
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

BIN
Assets/Content/Icons/Items/story_item_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 213 KiB

12
Assets/Content/Icons/Items/story_item_3.png.meta
View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -82,9 +82,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 10
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -95,7 +95,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
@ -121,9 +121,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 45
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

BIN
Assets/Content/Icons/Items/story_item_4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 154 KiB

12
Assets/Content/Icons/Items/story_item_4.png.meta
View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -82,9 +82,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 10
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -95,7 +95,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
@ -121,9 +121,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 45
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

BIN
Assets/Content/Icons/Items/story_item_5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 265 KiB

12
Assets/Content/Icons/Items/story_item_5.png.meta
View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -82,9 +82,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 10
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -95,7 +95,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
@ -121,9 +121,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 45
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

BIN
Assets/Content/Icons/Items/story_item_6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 178 KiB

12
Assets/Content/Icons/Items/story_item_6.png.meta
View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -82,9 +82,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 10
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -95,7 +95,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
@ -121,9 +121,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 45
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

BIN
Assets/Content/Icons/Items/story_item_7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 128 KiB

12
Assets/Content/Icons/Items/story_item_7.png.meta
View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -82,9 +82,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 10
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -95,7 +95,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
@ -121,9 +121,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 45
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

BIN
Assets/Content/Icons/Items/story_item_8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 303 KiB

12
Assets/Content/Icons/Items/story_item_8.png.meta
View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -82,9 +82,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 10
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -95,7 +95,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
@ -121,9 +121,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 45
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

2
Assets/Content/Prefabs/UI/UIChat/UIChat.prefab
View File

@ -12363,7 +12363,7 @@ MonoBehaviour:
rubberScale: 1
threshold: 100
lowGrid: 0
m_Cell: {fileID: 3661587436044585841}
m_Cell: {fileID: 70813078944487029, guid: 1cc947df2fbf59e4a8faf1ac2ace0239, type: 3}
m_Content: {fileID: 1561997325118980469}
m_Horizontal: 0
m_Vertical: 1

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

@ -1,5 +1,6 @@
local UIChatView = require("UIChat/UIChatView_Generate")
local UIChatRoot = require("UIChat/UIChatRoot")
local IconItemCtr = require("Common/IconItemCtr")
local regexPattern = "%[e%d+%]"
local emojiFormat = "[e%s]"
@ -246,17 +247,24 @@ function UIChatView:InitGiftWindow()
CommonUtil.LoopGridViewEleCreateNoItem(
self, self.chatLayer2.giftWindow.loopVerticalScrollRect, gifts, 0, self,
function (owner, go, idx, logicData)
local iconPath = logicData['Icon']
local name = logicData['Name']
-- local iconPath = logicData['Icon']
-- local name = logicData['Name']
-- local id = logicData['Id']
-- local uiTrigger = go:GetComponent(Enum.TypeInfo.UIEventTriggerListener)
-- uiTrigger.onClick = function() self:OnSendItem(id) end
-- local iconImage = go.transform:Find("Icon"):GetComponent(Enum.TypeInfo.Image)
-- local title = go.transform:Find("Info/Title"):GetComponent(Enum.TypeInfo.TextMeshProUGUI)
-- title.text = name
-- CommonUtil.LoadIcon(self, iconPath, function(sprite)
-- iconImage.sprite = sprite
-- end)
local id = logicData['Id']
local uiTrigger = go:GetComponent(Enum.TypeInfo.UIEventTriggerListener)
uiTrigger.onClick = function() self:OnSendItem(id) end
local iconImage = go.transform:Find("Icon"):GetComponent(Enum.TypeInfo.Image)
local title = go.transform:Find("Info/Title"):GetComponent(Enum.TypeInfo.TextMeshProUGUI)
title.text = name
CommonUtil.LoadIcon(self, iconPath, function(sprite)
iconImage.sprite = sprite
end)
local itemId = logicData['ItemId']
local itemNum = ManagerContainer.DataMgr.BagData:GetItemCountByCfgId(itemId)
local data = {cfgId = itemId, num = itemNum}
local itemLua = CommonUtil.BindGridViewItem2Lua(self, "IconItem", go)
IconItemCtr:SetData(self, itemLua, data, Enum.ItemIEnterType.Bag, self, function() self:OnSendItem(id) end)
end
)
end

1
Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua
View File

@ -890,6 +890,7 @@ function UILiveRoomView:Gen_Gift(loopview, index, row, col, room_id)
--LogWarning("cost_str: " .. Inspect(cost_str))
itemlua.text_price_off.text.text = cost_str
itemlua.text_price_on.text.text = cost_str
itemlua.text_name.text.text = info.Name
--设置图标
local iconpath = "LiveRoomGift/" .. info.Icon

6
Assets/Src/GameLogic/Battle/FighterManager/FighterManager.cs
View File

@ -500,9 +500,9 @@ public class FighterManager
public void OnFighterDie(Fighter fighter)
{
Debug.Log("tzy_角色死亡_1");
if (mBattle.IsNormalBattle) Debug.Log("tzy_角色死亡_2 " + fighter);
if (mBattle.IsNormalBattle && fighter.IsNpc) Debug.Log("tzy_角色死亡_3 ");
// Debug.Log("tzy_角色死亡_1");
// if (mBattle.IsNormalBattle) Debug.Log("tzy_角色死亡_2 " + fighter);
// if (mBattle.IsNormalBattle && fighter.IsNpc) Debug.Log("tzy_角色死亡_3 ");
if (mBattle.IsNormalBattle && fighter.IsNpc)
{
Vector3 startpos, goldpos, emptypos;