Commit Graph

103 Commits (3131ffca2f78f78bd15209334867f841c3e1d0ef)

Author SHA1 Message Date
zhangshanxue 78c3cd8adf 【资源】循环依赖处理 2021-08-26 20:25:22 +08:00
gaoxin 3e11938166 【meta】 2021-07-27 10:06:56 +08:00
ZhangBiao 190f3722a8 Merge branch 'china/dev' into 0优化/副本界面 2021-07-22 14:04:11 +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
DESKTOP-98AVA47\Administrator 53dadfff49 抽卡修改提交 2021-07-15 20:48:46 +08:00
ZhangBiao edaacd0e69 重复名资源提交 2021-07-15 17:24:56 +08:00
ZhangBiao e3baabda96 【副本界面】特效提交 2021-07-15 15:25:25 +08:00
gaoxin 9c58070aa8 Merge branch 'china/dev-c' into china/dev
# Conflicts:
#	Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
#	Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta
#	Assets/ManagedResources/DynamicAtlas/s_suoxiangpimi_banner_zh.png.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua
#	Assets/Scripts/Editor/GameEditor/FrameTool/ConfigWindow.cs
2021-07-06 15:27:09 +08:00
ZhangBiao 24469e4666 【灵兽山】特效修改 2021-06-28 16:56:26 +08:00
ZhangBiao 0a7d9bedc4 Revert "【灵兽山】特效资源提交"
This reverts commit aa495f7392.
2021-06-25 18:22:28 +08:00
ZhangBiao aa495f7392 【灵兽山】特效资源提交 2021-06-25 18:16:52 +08:00
gaoxin aec9b12ab2 【资源】玉皇大帝技能显示错误修复 2021-06-22 17:40:41 +08:00
gaoxin db2143bfac 【资源】玉皇大帝皮肤技能特效资源优化 2021-06-22 16:38:26 +08:00
gaoxin d04d0bbefb 【资源】玉皇大帝皮肤特效资源上传 2021-06-21 19:54:12 +08:00
gaoxin b3fca866e8 Revert "【山河试炼】开坑"
This reverts commit 4df5b08d1f.
2021-06-16 10:09:15 +08:00
ZhangBiao 4df5b08d1f 【山河试炼】开坑 2021-06-15 11:40:47 +08:00
JieLing 530374e00b 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
JieLing 2e798c6888 【资源名重复】 2021-06-10 18:24:59 +08:00
jiaoyangna 9ef020d022 重复资源修改提交 2021-05-27 20:49:35 +08:00
ZhangBiao b417d4eaa4 【修行】特效导入 2021-05-27 17:40:54 +08:00
ZhangBiao 613a0744de 【资源】提交 2021-05-27 15:16:07 +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 4a9cdc80fa 【资源】资源名重复修整 2021-04-29 21:08:11 +08:00
gaoxin a26bdd837e 【资源】遗漏资源补齐 2021-04-29 20:53:00 +08:00
gaoxin 0b260fd03a 【资源】至尊降世资源修改 2021-04-29 20:48:39 +08:00
gaoxin 7bae49b1c2 【至尊降世】特效修改 2021-04-29 17:53:40 +08:00
jiaoyangna 1da013efda 剧情提交 2021-04-29 15:35:18 +08:00
wangzhenxing d2a7fdcee1 天尊降世活动资源提交 2021-04-27 22:16:42 +08:00
jiaoyangna 15ef116032 剧情提交 2021-04-26 09:41:41 +08:00
ZhangBiao 98237651c9 Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼 2021-04-16 16:22:13 +08:00
jiaoyangna f91b6f8ca1 资源重复修改提交 2021-04-16 14:53:44 +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 d423390397 【十五日登录】特效+无尽副本编队问题 2021-04-07 20:27:56 +08:00
ZhangBiao 4c0150b7d9 【十五日登陆】导入特效资源 2021-04-02 16:04:57 +08:00
gaoxin 5ae49a698d 【特效】嫦娥,金吒特效修改 2021-03-27 19:02:40 +08:00
JieLing abd4028923 【meta】打包后meta文件上传 2021-03-09 16:04:18 +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
ZhangBiao 3c32b2aa4a 【本地化】我要变强 灵兽lv修改 2021-03-05 15:14:22 +08:00
gaoxin bf3a6eb705 【本地化】界面显示问题修复 2021-01-29 13:34:16 +08:00
JieLing 32dfac2429 【资源名字冲突】 2021-01-18 18:02:23 +08:00
jiaoyangna 6ae1a0b75e 【ID1007696】
【优化】逍遥游移动时头顶出现金币的奖励特效
2021-01-07 17:45:50 +08:00
jiaoyangna 44951a3766 [战斗] ====优化伤害,中毒燃烧数字显示速度 2020-12-31 14:14:56 +08:00
jiaoyangna 0054f5e646 【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名) 2020-12-24 10:37:38 +08:00