xiejun
|
b47c16dcb7
|
test
|
2023-06-20 18:01:51 +08:00 |
wangzhenxing
|
47080ca0e1
|
英雄方框特效修改提交
|
2023-01-12 16:16:03 +08:00 |
yuanshuai
|
d952b9a44c
|
数字游戏模块提交
|
2022-07-11 15:43:04 +08:00 |
gaoxin
|
be2fca6434
|
【资源】热更资源过大优化
|
2022-01-24 16:52:54 +08:00 |
wangzhenxing
|
0fd8ea0add
|
[飞升]=======特效资源提交
|
2022-01-19 15:36:17 +08:00 |
wangzhenxing
|
4034a90a33
|
[飞升]======优化修改提交
|
2022-01-19 15:29:47 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
wangzhenxing
|
581bfa2615
|
【飞升】=============飞升特效修改提交
|
2022-01-10 13:59:07 +08:00 |
gaoxin
|
0ea258d1e8
|
【资源】各阵营普攻特效优化
|
2021-11-24 14:42:05 +08:00 |
wangzhenxing
|
338312dbd7
|
【战斗】=======4阵营普通攻击新特效上传
|
2021-11-24 14:41:44 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +08:00 |
gaoxin
|
908ca14632
|
【shader】添加对所有平台的支持
|
2021-08-28 13:40:15 +08:00 |
zhangshanxue
|
c542bf612d
|
【资源】循环依赖处理
|
2021-08-26 22:29:58 +08:00 |
wangzhenxing
|
690db47d68
|
【战斗】=========复活,新灼烧特效预设提交
|
2021-08-25 14:37:10 +08:00 |
jiaoyangna
|
bac3e3dfa9
|
动画提交
|
2021-07-28 18:39:05 +08:00 |
zhangqiang
|
042644bdcb
|
【资源】冲突处理
|
2021-07-27 13:53:37 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
gaoxin
|
3e11938166
|
【meta】
|
2021-07-27 10:06:56 +08:00 |
wangzhenxing
|
02cea65055
|
[称号]====跨服称号资源提交
|
2021-07-23 11:20:05 +08:00 |
jiaoyangna
|
4d8bf852d4
|
Revert "bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40"
This reverts commit 01b3f79c43 .
|
2021-07-19 14:10:11 +08:00 |
jiaoyangna
|
01b3f79c43
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40
|
2021-07-19 14:09:40 +08:00 |
ZhangBiao
|
7e17f8c3a1
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-07-15 19:48:50 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b97a35ce8
|
mata 文件修改提交
|
2021-07-15 19:44:55 +08:00 |
ZhangBiao
|
edaacd0e69
|
重复名资源提交
|
2021-07-15 17:24:56 +08:00 |
DESKTOP-98AVA47\Administrator
|
4bd4f1f483
|
Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-15 16:24:35 +08:00 |
ZhangBiao
|
e3baabda96
|
【副本界面】特效提交
|
2021-07-15 15:25:25 +08:00 |
DESKTOP-98AVA47\Administrator
|
25939d4d25
|
玲珑宝镜特效上传
|
2021-07-15 14:44:19 +08:00 |
jiaoyangna
|
6da6d47bcc
|
商店界面特效修改提交
|
2021-07-02 15:52:30 +08:00 |
jiaoyangna
|
7542d5e607
|
首充修改提交
|
2021-06-26 15:15:27 +08:00 |
ZhangBiao
|
4e2463723a
|
【灵兽】特效添加
|
2021-06-26 14:50:52 +08:00 |
jiaoyangna
|
748f9be757
|
首充修改提交
|
2021-06-24 11:12:34 +08:00 |
gaoxin
|
dd19b43dd6
|
【特效】修复特权商城扫光特效显示错误
|
2021-06-10 15:54:57 +08:00 |
gaoxin
|
8d6168a7d9
|
【称号】优化称号在老包中的显示
|
2021-06-08 11:04:11 +08:00 |
gaoxin
|
be558c88f8
|
【特效】修复新称号特效显示错误
|
2021-06-07 21:28:45 +08:00 |
wangzhenxing
|
5bd6093c18
|
[称号]====新称号shader 修改
|
2021-06-02 21:29:26 +08:00 |
wangzhenxing
|
5cf037f6da
|
[称号]=======聊天界面新称号显示修改
|
2021-06-02 21:07:02 +08:00 |
ZhangBiao
|
b417d4eaa4
|
【修行】特效导入
|
2021-05-27 17:40:54 +08:00 |
gaoxin
|
653d9bbd06
|
【meta】
|
2021-05-26 13:43:11 +08:00 |
ZhangBiao
|
098ab986e4
|
【修行】meta提交
|
2021-05-19 20:43:16 +08:00 |
gaoxin
|
73f476a4e8
|
【资源】重复资源删除
|
2021-05-19 14:26:37 +08:00 |
gaoxin
|
6b9cfdd6c2
|
【资源】新增物品资源
|
2021-05-14 15:54:28 +08:00 |
wangzhenxing
|
d4a0a902bd
|
聊天界面称号特效显示修改
|
2021-04-30 11:17:02 +08:00 |
jiaoyangna
|
dd8d7df89f
|
剧情特效提交
|
2021-04-29 18:55:31 +08:00 |
wangzhenxing
|
4cc296e58f
|
【天尊降世】遗漏资源提交
|
2021-04-27 22:55:45 +08:00 |
gaoxin
|
357a27c100
|
Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
# Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-04-26 19:03:05 +08:00 |
jiaoyangna
|
15ef116032
|
剧情提交
|
2021-04-26 09:41:41 +08:00 |
wangzhenxing
|
898edb53be
|
[功能]==========聊天称号特效显示修改
|
2021-04-23 14:46:37 +08:00 |
ZhangBiao
|
08d8e0b8f3
|
【云游商人】特效问题修改
|
2021-04-23 14:16:40 +08:00 |
ZhangBiao
|
375e7a6205
|
【特效穿透】增加shader
|
2021-04-22 20:45:01 +08:00 |
ZhangBiao
|
cce3a957f3
|
meta提交
|
2021-04-14 11:24:41 +08:00 |