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 |
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 |
JieLing
|
9cd895e8e9
|
【资源处理】meta文件提交,文件压缩优化
|
2021-04-12 15:00:57 +08:00 |
jiaoyangna
|
9496ef8943
|
meta 文件提交
(cherry picked from commit e0fec1aa3a)
|
2021-04-09 13:42:03 +08:00 |
ZhangBiao
|
a862a66cd3
|
【十五日登录】提交
|
2021-04-06 12:07:03 +08:00 |
ZhangBiao
|
4c0150b7d9
|
【十五日登陆】导入特效资源
|
2021-04-02 16:04:57 +08:00 |
gaoxin
|
23e5bb6f98
|
【五星成长礼】添加箭头动画
|
2021-03-30 21:23:42 +08:00 |
gaoxin
|
5ae49a698d
|
【特效】嫦娥,金吒特效修改
|
2021-03-27 19:02:40 +08:00 |
jiaoyangna
|
5bd35da17c
|
Revert "图片整理提交"
This reverts commit 988b881285.
|
2021-03-09 14:37:14 +08:00 |
jiaoyangna
|
0b5afbc4ea
|
Revert "删除 有_zh的图片的 没有加后缀的 图片"
This reverts commit 72998061d8.
|
2021-03-09 14:36:27 +08:00 |
jiaoyangna
|
72998061d8
|
删除 有_zh的图片的 没有加后缀的 图片
|
2021-03-09 14:08:19 +08:00 |
jiaoyangna
|
988b881285
|
图片整理提交
|
2021-03-09 12:44:53 +08:00 |
zhangqiang
|
0af293c7d9
|
【巅峰赛 部分】
|
2021-03-05 15:12:15 +08:00 |
ZhangBiao
|
f36126d291
|
【本地化】雷震子技能百篇
|
2021-03-02 15:22:51 +08:00 |
liujiaqi
|
866fd6c3fc
|
【资源】越南语临时资源替换
|
2021-02-26 11:23:02 +08:00 |
gaoxin
|
9559607b51
|
【本地化】部分扫光特效处理,充值界面妖精文字改图标
|
2021-01-28 15:37:44 +08:00 |
jiaoyangna
|
6ae1a0b75e
|
【ID1007696】
【优化】逍遥游移动时头顶出现金币的奖励特效
|
2021-01-07 17:45:50 +08:00 |
jiaoyangna
|
0054f5e646
|
【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名)
|
2020-12-24 10:37:38 +08:00 |
jiaoyangna
|
a446b83908
|
冲突修改提交
|
2020-12-07 16:29:22 +08:00 |
JieLing
|
04ba352791
|
【资源】 修改资源路径
|
2020-11-02 19:54:12 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
gaoxin
|
7b7def3f8f
|
勇冠三军,叱咤风云活动添加
|
2020-09-27 16:09:55 +08:00 |
gaoxin
|
fb6a6c9da5
|
添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备
|
2020-09-05 12:30:00 +08:00 |
gaoxin
|
30697705be
|
每次销毁界面时清理一次不用的资源,界面打开音效配置添加
|
2020-09-04 10:03:35 +08:00 |
gaoxin
|
d1facab9de
|
重复引用的资源路径修改
|
2020-09-03 19:50:26 +08:00 |
gaoxin
|
e912a4c3ad
|
修复按钮点击动画不生效的问题
|
2020-08-31 17:59:46 +08:00 |