ZhangBiao
|
1ece0c1a77
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-10 16:25:56 +08:00 |
ZhangBiao
|
ec9458aac7
|
【易经宝库】抽取灵兽报错修复
|
2020-11-10 16:25:42 +08:00 |
gaoxin
|
b8c6bf7a62
|
【白泽】音效修改
|
2020-11-10 15:46:26 +08:00 |
gongjiawei
|
0d56c34220
|
白泽灵兽语音修改
|
2020-11-10 15:28:25 +08:00 |
jiaoyangna
|
0d26c4d0ab
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-10 15:26:42 +08:00 |
jiaoyangna
|
2e125eaa47
|
新手引导修改
|
2020-11-10 15:26:33 +08:00 |
liujiaqi
|
21248cf571
|
定卦神锄资源
|
2020-11-10 14:56:03 +08:00 |
JieLing
|
3e24ba9bcf
|
Revert "定卦神锄新图标上传"
This reverts commit 495ea6e24e.
|
2020-11-10 14:47:18 +08:00 |
ZhangBiao
|
d493246f2f
|
【灵兽抽卡】 开坑
|
2020-11-10 11:34:19 +08:00 |
zhangqiang
|
53e538ea0d
|
【音效】 替换
|
2020-11-10 11:32:30 +08:00 |
zhangqiang
|
7f5287baa2
|
【音效】 替换
|
2020-11-10 11:32:06 +08:00 |
jiaoyangna
|
05911e105c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-10 11:04:28 +08:00 |
jiaoyangna
|
89a90ae5c5
|
神医天降修改
|
2020-11-10 11:04:19 +08:00 |
gaoxin
|
8ef89acdde
|
【bug】修复部分界面文字显示错误的问题
|
2020-11-10 10:37:53 +08:00 |
gaoxin
|
a12003191c
|
【音效】孙悟空技能音效添加
|
2020-11-10 10:26:01 +08:00 |
jiaoyangna
|
22d3761937
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-10 10:24:07 +08:00 |
jiaoyangna
|
3f7ae45011
|
皮肤修改
|
2020-11-10 10:23:55 +08:00 |
zhangqiang
|
6278bb0cc8
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:16:23 +08:00 |
zhangqiang
|
92d85c4200
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:16:01 +08:00 |
zhangqiang
|
6a1693939c
|
【觉醒】 觉醒添加图鉴
|
2020-11-09 20:05:51 +08:00 |
liujiaqi
|
495ea6e24e
|
定卦神锄新图标上传
(cherry picked from commit 89c73695e2)
|
2020-11-09 18:10:50 +08:00 |
zhangqiang
|
85b21b27f0
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-09 18:04:54 +08:00 |
zhangqiang
|
c4a466637f
|
【神将升级】 太快优化
|
2020-11-09 16:29:06 +08:00 |
ZhangBiao
|
46b8e52524
|
【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复
(cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025)
|
2020-11-09 16:02:34 +08:00 |
wangzhenxing
|
4fa66650f0
|
[皮肤]伤害统计界面添加皮肤显示
|
2020-11-09 15:54:36 +08:00 |
ZhangBiao
|
dca4f2511a
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-09 15:29:42 +08:00 |
ZhangBiao
|
e6eb5d7673
|
【易经宝库】格子点击位置不准确修复 曾加tips
|
2020-11-09 15:28:24 +08:00 |
zhangqiang
|
d6ab502c45
|
【逍遥游】 通关后返回问题修复
|
2020-11-09 15:24:38 +08:00 |
DESKTOP-98AVA47\Administrator
|
4be2045801
|
添加容错 --by 焦杨钠
|
2020-11-13 07:12:51 +08:00 |
zhangqiang
|
f94c84f1cd
|
【觉醒】 增加觉醒页签
|
2020-11-09 15:04:48 +08:00 |
ZhangBiao
|
c4745e8c7c
|
【易经宝库】最终奖励选择bug修复
|
2020-11-09 13:47:37 +08:00 |
zhangqiang
|
de677bee2f
|
【觉醒】增加脚本
|
2020-11-09 11:13:53 +08:00 |
ZhangBiao
|
d0e2133cbc
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-09 11:09:50 +08:00 |
ZhangBiao
|
9ca403ebff
|
【易经宝库】第三层抽取完成后bug修复
|
2020-11-09 11:09:42 +08:00 |
jiaoyangna
|
5d24bbb8a8
|
森罗环境英雄皮肤提交
|
2020-11-09 10:32:17 +08:00 |
zhangqiang
|
5c73587f89
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-11-09 10:16:16 +08:00 |
liujiaqi
|
75a878e9d7
|
【资源】白骨精法宝占坑资源。白骨精技能字资源白骨精技能图标资源
|
2020-11-08 19:23:17 +08:00 |
ZhangBiao
|
1d5551eee7
|
【社稷大典】连续捐献-1修复
|
2020-12-07 20:15:49 +08:00 |
gaoxin
|
9e4e1e7a99
|
【音效】白骨精技能音效添加
|
2020-12-07 17:02:20 +08:00 |
ZhangBiao
|
de32379f8e
|
【竞技场】竞技场增加输赢奖励
|
2020-11-07 18:52:04 +08:00 |
jiaoyangna
|
f26214ac58
|
清楚红点提交
|
2020-11-07 17:23:10 +08:00 |
jiaoyangna
|
6cb1610d31
|
神医天降修改
|
2020-11-07 16:56:53 +08:00 |
jiaoyangna
|
bc097708e9
|
不满足进阶条件,显示红点
|
2020-11-07 16:41:25 +08:00 |
jiaoyangna
|
e2b29242c7
|
有孙悟空皮肤,东华帝君皮肤点不到获取途径
|
2020-11-07 15:52:20 +08:00 |
jiaoyangna
|
4cf115e655
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-07 15:45:02 +08:00 |
jiaoyangna
|
f2f288c682
|
进阶页签属性图标显示错误
|
2020-11-07 15:44:53 +08:00 |
gaoxin
|
c3916271aa
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-07 15:43:07 +08:00 |
gaoxin
|
bd6e61d92a
|
【语言工具】添加代码语言还原工具
|
2020-11-07 15:42:11 +08:00 |
jiaoyangna
|
e517e2a175
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-07 15:39:10 +08:00 |
jiaoyangna
|
04fac7f216
|
魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗
|
2020-11-07 15:39:01 +08:00 |
jiaoyangna
|
77047346dd
|
神医天降价格修改
|
2020-11-14 14:43:48 +08:00 |
jiaoyangna
|
ef4c4fccba
|
power change update
|
2020-11-14 14:31:38 +08:00 |
jiaoyangna
|
c639ea1c6b
|
delete log
|
2020-11-14 14:16:41 +08:00 |
jiaoyangna
|
069d42baca
|
皮肤到期刷新
|
2020-11-14 14:16:10 +08:00 |
zhangqiang
|
b113f94a6d
|
【幻境达人】 排行奖励显示问题
|
2020-11-07 15:20:44 +08:00 |
zhangqiang
|
68979d577e
|
【神将觉醒】 觉醒成功界面
|
2020-11-07 15:15:49 +08:00 |
jiaoyangna
|
8f1c52c5e3
|
属性加成修改
|
2020-11-06 21:23:24 +08:00 |
jiaoyangna
|
d4687b2b74
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 21:05:43 +08:00 |
jiaoyangna
|
3a481d6d5f
|
[皮肤]修改提交
|
2020-11-06 21:05:39 +08:00 |
gaoxin
|
05fb2f5e7f
|
【战斗】修复战斗中受击特效及音效错误的问题,修复假战斗星级显示错误
|
2020-11-06 20:45:44 +08:00 |
jiaoyangna
|
93d9212f85
|
皮肤加成属性修改
|
2020-11-06 20:39:00 +08:00 |
jiaoyangna
|
0a772f466b
|
皮肤提交
|
2020-11-06 20:36:38 +08:00 |
jiaoyangna
|
98ff210ae2
|
皮肤解锁提示
|
2020-11-06 20:21:20 +08:00 |
jiaoyangna
|
bd92d5339d
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 19:54:49 +08:00 |
jiaoyangna
|
22038419b7
|
神医天降提交
|
2020-11-06 19:54:00 +08:00 |
zhangqiang
|
34d67b93f6
|
【巅峰赛】 赛程 三局第一局结果有问题 修改
|
2020-11-06 18:32:48 +08:00 |
wangzhenxing
|
5128a02eba
|
[皮肤] 胜利最佳输出界面显示皮肤
|
2020-11-06 17:58:28 +08:00 |
JieLing
|
7913bda03f
|
【资源】重名资源修改
|
2020-11-06 17:56:55 +08:00 |
gaoxin
|
5b0ac7cd0b
|
【音效】灵兽音效资源同步
|
2020-11-06 17:45:18 +08:00 |
jiaoyangna
|
a6904526d3
|
协议提交
|
2020-11-06 17:26:58 +08:00 |
jiaoyangna
|
41f62176f2
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 17:19:34 +08:00 |
jiaoyangna
|
fe9b73aa0b
|
协议提交
|
2020-11-06 17:19:24 +08:00 |
zhangqiang
|
98d4b3b024
|
【达人奖励排行】 显示问题修复
|
2020-11-06 17:18:17 +08:00 |
wangzhenxing
|
9eb5161c7e
|
【皮肤】东华帝君 ,孙悟空技能特效修改提交
|
2020-11-06 17:02:42 +08:00 |
zhangqiang
|
aa2db3e25e
|
【大闹天宫】 节点boss 站位错误 修复
|
2020-11-06 16:51:44 +08:00 |
zhangqiang
|
7121be9c04
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 16:49:18 +08:00 |
zhangqiang
|
ac64980843
|
【易经宝库】 特效层级调整
|
2020-11-06 16:49:12 +08:00 |
jiaoyangna
|
6a95033b8b
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 16:39:45 +08:00 |
jiaoyangna
|
cd99dd509b
|
立绘加载错误修改
|
2020-11-06 16:37:52 +08:00 |
zhangqiang
|
1a4349d93b
|
【觉醒】 界面提交
|
2020-11-06 16:23:02 +08:00 |
ZhangBiao
|
fab6570a26
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 16:17:21 +08:00 |
ZhangBiao
|
5e130a7585
|
Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
# Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
# Assets/ManagedResources/Effects/Model/Materials.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-11-06 16:17:12 +08:00 |
jiaoyangna
|
ccdba2b2df
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 16:11:47 +08:00 |
jiaoyangna
|
5251bc4059
|
[神将界面修改]
|
2020-11-06 16:11:37 +08:00 |
ZhangBiao
|
36759d8044
|
【易经宝库】增加稿子动效
|
2020-11-06 16:06:08 +08:00 |
zhangqiang
|
44350558c5
|
【巅峰赛】 头像特效设置层级有问题 线上
|
2020-11-06 15:49:08 +08:00 |
yuanshuai
|
327584750a
|
【逍遥游】预设修改提交
|
2020-11-06 15:48:59 +08:00 |
gaoxin
|
34617d419d
|
【资源】新增英雄icon资源位置移动
|
2020-11-06 15:48:21 +08:00 |
ZhangBiao
|
b98490f233
|
【易经宝库】差一个稿子的动效
|
2020-11-06 15:11:19 +08:00 |
gaoxin
|
f1ca8398d3
|
【战斗】假战斗随机种子读表
|
2020-11-06 15:04:11 +08:00 |
wangzhenxing
|
4a6d8b393f
|
技能提交去除log
|
2020-11-06 15:04:05 +08:00 |
wangzhenxing
|
ab4f97fa0a
|
皮肤修改提交
|
2020-11-06 15:03:56 +08:00 |
gaoxin
|
c3422f1c8d
|
【资源】资源名重复修改
|
2020-11-06 15:02:46 +08:00 |
gaoxin
|
013ff84d34
|
【资源】孙悟空,东华帝君皮肤技能特效资源添加
|
2020-11-06 15:02:36 +08:00 |
jiaoyangna
|
767541c1a6
|
编队界面皮肤位置修改
|
2020-11-06 14:30:44 +08:00 |
ZhangBiao
|
b516a8c202
|
【易经宝库】没有QA 无法购买
|
2020-11-06 13:36:48 +08:00 |
wangzhenxing
|
04fce03cd8
|
battlemanager修改提交
|
2020-11-06 13:32:04 +08:00 |
wangzhenxing
|
1123b38709
|
协议提交
|
2020-11-06 13:31:45 +08:00 |
wangzhenxing
|
3e917799bb
|
解决冲突提交
|
2020-11-06 13:31:30 +08:00 |
jiaoyangna
|
b7b4fb9d5d
|
meta 提交
|
2020-11-06 13:27:52 +08:00 |
gaoxin
|
927f2280e8
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 11:41:49 +08:00 |
gaoxin
|
857f97f2ab
|
【战斗】假战斗数据组建错误修复
|
2020-11-06 11:41:40 +08:00 |
liujiaqi
|
b637d17a9b
|
孙悟空东华帝君皮肤资源
|
2020-11-06 11:21:29 +08:00 |
gaoxin
|
d668e4ffc3
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
|
2020-11-06 11:19:46 +08:00 |
gaoxin
|
1ac0e6fc53
|
【战斗】添加新的假战斗功能
|
2020-11-06 11:18:09 +08:00 |
zhangqiang
|
3ae2d1048e
|
【GM】gm工具优化
|
2020-11-06 11:16:24 +08:00 |
jiaoyangna
|
a109c2f93f
|
【皮肤】 战斗提交
|
2020-11-06 10:51:41 +08:00 |
jiaoyangna
|
e8be02de87
|
[移山倒海] 提交
|
2020-11-06 10:49:08 +08:00 |
jiaoyangna
|
beec28a8b8
|
Merge branch 'master_xma_local' into 0功能/皮肤
|
2020-11-06 10:34:22 +08:00 |
zhangqiang
|
ea24696722
|
【逍遥游】新增地图 xbhz
|
2020-11-06 10:15:06 +08:00 |
jiaoyangna
|
e2fae0cc52
|
皮肤提交
|
2020-11-06 09:37:27 +08:00 |
ZhangBiao
|
6f75850ae4
|
【易经宝库】提交
|
2020-11-05 19:10:20 +08:00 |
jiaoyangna
|
ccf02fb171
|
【皮肤】添加倒计时
|
2020-11-05 18:26:38 +08:00 |
jiaoyangna
|
5026bdd0c3
|
【皮肤】提交
|
2020-11-05 16:02:49 +08:00 |
jiaoyangna
|
3bc2b74ce5
|
皮肤分解提交
|
2020-11-05 14:18:32 +08:00 |
ZhangBiao
|
476057bd1c
|
【易经宝库】主界面奖励显示 通用奖励界面创建
|
2020-11-04 19:51:58 +08:00 |
jiaoyangna
|
14812dab65
|
[皮肤]倒计时修改
|
2020-11-04 18:29:49 +08:00 |
jiaoyangna
|
d7b9563e35
|
【皮肤】神将合成修改
|
2020-11-04 16:56:24 +08:00 |
jiaoyangna
|
360727419e
|
【皮肤】修改皮肤显示
|
2020-11-04 16:51:45 +08:00 |
jiaoyangna
|
6930561350
|
[皮肤]神将界面修改提交
|
2020-11-04 14:24:35 +08:00 |
jiaoyangna
|
644d984c0a
|
登陆报错修改
|
2020-11-04 14:24:08 +08:00 |
jiaoyangna
|
b18b4cfd58
|
【皮肤】协议提交
|
2020-11-04 13:52:10 +08:00 |
jiaoyangna
|
79a5bcb74c
|
皮肤资源提交
|
2020-11-04 12:02:57 +08:00 |
jiaoyangna
|
4cb31d8f38
|
[皮肤]提交
|
2020-11-04 10:59:04 +08:00 |
jiaoyangna
|
509357e333
|
Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2020-11-04 10:54:54 +08:00 |
ZhangBiao
|
809c6daa01
|
【易经宝库】数据调试
|
2020-11-04 10:53:02 +08:00 |
jiaoyangna
|
1fcdf5b2a6
|
【皮肤】添加皮肤属性加成
|
2020-11-03 19:37:05 +08:00 |
zhangqiang
|
3ae4ed1d41
|
【英雄合成】 添加提示
|
2020-11-03 19:19:13 +08:00 |
ZhangBiao
|
ab757a2543
|
【特权商城】最后一分钟报错修改
|
2020-11-03 19:10:32 +08:00 |
ZhangBiao
|
d1c0d3e41f
|
【易经宝库】资源路径提交
|
2020-11-03 19:02:31 +08:00 |
ZhangBiao
|
5d40b102dc
|
【易经宝库】添加type 拼数据
|
2020-11-03 19:01:47 +08:00 |
gaoxin
|
5a861ade95
|
【商店】前端从表里判断商品的显示状态添加
|
2020-11-03 18:01:31 +08:00 |
ZhangBiao
|
e7b132952c
|
【特权商城】报错修改
|
2020-11-03 17:53:14 +08:00 |
jiaoyangna
|
e92e63444b
|
皮肤提交
|
2020-11-03 17:27:32 +08:00 |
gaoxin
|
e1625e6bed
|
【战斗】修复回合末释放的灵兽技能释放时界面显示已经到下一回合的问题
|
2020-11-03 17:17:46 +08:00 |
ZhangBiao
|
c3537b3486
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-03 17:05:15 +08:00 |
ZhangBiao
|
81e26c3128
|
【特权商城】增加 灵兽特权礼包 文字描述
|
2020-11-03 17:04:45 +08:00 |
zhangqiang
|
0918acadd4
|
【灵兽系统】 羁绊预设微调
|
2020-11-03 16:10:45 +08:00 |
zhangqiang
|
0a8498b95e
|
【灵兽系统】 召唤界面按钮文字位置
|
2020-11-03 16:08:10 +08:00 |
gaoxin
|
49576b20ad
|
【战斗】修复战斗内名称不显示和我方元素显示错误的问题
|
2020-11-03 15:34:22 +08:00 |
gaoxin
|
23717d6fc9
|
【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题
|
2020-11-03 15:34:12 +08:00 |
jiaoyangna
|
d040e4dded
|
神将界面结构修改
|
2020-11-03 15:17:48 +08:00 |
zhangqiang
|
5d6db87650
|
【灵兽系统】召唤界面 按钮位置有问题
|
2020-11-03 14:51:58 +08:00 |
wangzhenxing
|
18401c0663
|
合并PokemonSummonOneResultPanel.prefab
|
2020-11-03 14:19:09 +09:00 |
zhangqiang
|
f8b4befd3c
|
【灵兽系统】 按钮位置调整
|
2020-11-03 14:17:33 +08:00 |
gaoxin
|
9380675560
|
【资源】新增灵兽特权icon图标
|
2020-11-03 14:16:36 +08:00 |
wangzhenxing
|
5f518babce
|
[灵兽]灵兽奖励预览排序 抽卡再来一次字体位置修改
|
2020-11-03 14:18:02 +09:00 |
ZhangBiao
|
f79499faea
|
【易经宝库】开始获取活动数据
|
2020-11-03 09:58:37 +08:00 |
gaoxin
|
d00d3e803c
|
【商店】删除商店的动画显示
|
2020-11-03 01:00:58 +08:00 |
gaoxin
|
ba42282cc3
|
【战斗】修改会自己动的指定目标特效的显示时长
|
2020-11-03 01:00:53 +08:00 |
gaoxin
|
108e5b2568
|
【战斗】前摇特效添加指定位置释放的类型
|
2020-11-02 23:24:43 +08:00 |
zhangqiang
|
342a1bd373
|
【灵兽系统】 放生选择数量修改
|
2020-11-02 23:09:58 +08:00 |
gaoxin
|
34b4b5db51
|
【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题
|
2020-11-02 22:55:24 +08:00 |
gaoxin
|
d10134216c
|
【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题--2
|
2020-11-02 22:13:34 +08:00 |
gaoxin
|
9dc9ca2b2a
|
【战斗】修复战斗界面资源回收时报错
|
2020-11-02 22:13:30 +08:00 |
liujiaqi
|
355d843b30
|
灵兽相关道具资源图标正式
|
2020-11-02 22:05:10 +08:00 |
gaoxin
|
cb10b3ff1d
|
【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题。
|
2020-11-02 21:49:33 +08:00 |
gaoxin
|
9779a99414
|
【战斗】修复灵兽释放技能顺序错误
|
2020-11-02 21:24:00 +08:00 |
gaoxin
|
8b9276f6a2
|
【战斗】修复上一场残留数据会出现在下一场的问题
|
2020-11-02 21:23:55 +08:00 |
zhangqiang
|
8e9b7b49e7
|
【特权礼包】 购买后到期 报错 尝试修复
|
2020-11-02 20:51:25 +08:00 |
wangzhenxing
|
36b9ffce91
|
【bug】分解界面等级星级显示修改
|
2020-11-02 20:13:57 +09:00 |
wangzhenxing
|
868eb64ae1
|
[bug] 分解神将等级显示999
|
2020-11-02 20:09:24 +09:00 |
JieLing
|
04ba352791
|
【资源】 修改资源路径
|
2020-11-02 19:54:12 +08:00 |
gaoxin
|
54f1660bc2
|
【好友切磋】修复战斗结果显示错误的问题
|
2020-11-02 19:17:19 +08:00 |
gaoxin
|
4cb8bee4ae
|
【战斗】修复凤凰技能第二回合无法触发的问题,修复战斗开始时界面显示回合数错误的问题
|
2020-11-02 19:17:14 +08:00 |
zhangqiang
|
cbe24364ec
|
【灵兽系统】 调主城的位置
|
2020-11-02 18:16:28 +08:00 |
gaoxin
|
3a542e5c63
|
【战斗】技能特效添加会自己动的指定目标特效
|
2020-11-02 18:09:04 +08:00 |
gaoxin
|
d94d5bc15c
|
【特效】应龙技能受击特效改三个为一个
|
2020-11-02 18:08:59 +08:00 |
ZhangBiao
|
8640018b87
|
【易经宝库】开坑 搭界面 和做动画
|
2020-11-02 18:05:24 +08:00 |
zhangqiang
|
e19412791d
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-02 17:46:15 +08:00 |
liujiaqi
|
7a70acff6c
|
灵兽相关道具图标资源占坑
|
2020-11-02 17:46:08 +08:00 |
zhangqiang
|
869f54799e
|
【灵兽系统】 加新手 加升级动画
|
2020-11-02 17:28:52 +08:00 |
wangzhenxing
|
92d5b659a1
|
[放生灵兽]灵兽放生显示返还货币修改
|
2020-11-02 17:36:08 +09:00 |
wangzhenxing
|
5eaa5a725d
|
[灵兽抽卡]灵兽抽卡显示修改
|
2020-11-02 17:19:06 +09:00 |
gaoxin
|
25f88a2a98
|
【LOG】删除无用log,添加凤凰技能概率log
|
2020-11-02 16:53:26 +08:00 |
gaoxin
|
ad4ebc14a0
|
【战斗】修复凤凰概率技能无法生效的问题
|
2020-11-02 16:31:57 +08:00 |
wangzhenxing
|
6c388f5d94
|
【效果】添加119效果
|
2020-11-02 16:21:06 +09:00 |
zhangqiang
|
65b5cff36d
|
【灵兽系统】 修改bug
|
2020-11-02 16:17:33 +08:00 |
gaoxin
|
acaece5483
|
【战斗】前端添加自动上传结果不一致的战斗数据的功能。
|
2020-11-02 16:07:43 +08:00 |
zhangqiang
|
df8f8d6dd0
|
【灵兽系统】 加引导 和 特权加15日礼包 判断
|
2020-11-02 15:56:06 +08:00 |
wangzhenxing
|
ce0e5a8229
|
【灵兽放生】灵兽放生界面数量超过一屏,选中底部灵兽选中状态错误修改
|
2020-11-02 15:02:47 +09:00 |
zhangqiang
|
3bbaab27be
|
【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序
|
2020-11-02 14:36:21 +08:00 |
gaoxin
|
c90e209fd6
|
【战斗】修复技能效果修改导致被动技能报错的问题
|
2020-11-02 14:12:28 +08:00 |
wangzhenxing
|
52fbe638f6
|
[灵兽]灵兽聚灵结果界面再来一次添加妖晶抽卡限制次数
|
2020-11-02 13:59:55 +09:00 |
gaoxin
|
02a57e692c
|
【战斗】修复部分被动技能报错
|
2020-11-02 13:49:53 +08:00 |
zhangqiang
|
148b068c79
|
【达人排行榜】 达人排行榜底部显示问题
|
2020-11-02 12:54:36 +08:00 |
gaoxin
|
9b65cbba0f
|
【战斗】灵兽技能前摇特效播放位置调整,灵兽技能条件添加类型3,修复灵兽立绘不会回收的问题
|
2020-11-02 11:55:28 +08:00 |
zhangqiang
|
4cb30990e1
|
【灵兽系统】 bug 需同步
|
2020-11-02 11:52:00 +08:00 |
zhangqiang
|
c206f6487e
|
【灵兽系统】 漏合
|
2020-11-02 10:59:17 +08:00 |
zhangqiang
|
8f71eb7672
|
【灵兽系统】bug 同步到dev
|
2020-11-02 10:58:48 +08:00 |
zhangqiang
|
1cb323a700
|
【灵兽系统】 预设修改
|
2020-11-02 10:16:36 +08:00 |
gaoxin
|
230788670d
|
【战斗】主动效果117,118添加
|
2020-11-02 10:00:32 +08:00 |
gaoxin
|
3cdc100777
|
【社稷大典/灵兽】特效资源重新整理
|
2020-11-01 17:00:39 +08:00 |
gaoxin
|
23253f96a2
|
【社稷大典】名字重复的资源处理
|
2020-11-01 16:23:08 +08:00 |
gaoxin
|
21ec70a29e
|
【灵兽】抽卡特效位置移动
|
2020-11-01 16:20:04 +08:00 |
gaoxin
|
9ed00e0ba5
|
【战斗】灵兽战斗逻辑同步
|
2020-11-01 16:17:26 +08:00 |
gaoxin
|
a2bfc34833
|
【音效】打开界面播放音效时不再播放点击音效
|
2020-11-01 14:45:09 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
gaoxin
|
d7a33ed404
|
【逍遥游】首通需要显示奖励数量
|
2020-10-30 13:28:57 +08:00 |
gaoxin
|
f519c35bbd
|
【逍遥游】修改地图的解锁方式为按顺序解锁,奖励显示不再显示数量并添加标签显示。
|
2020-10-30 13:28:19 +08:00 |
liujiaqi
|
c16a291063
|
逍遥特权图标资源
|
2020-10-30 13:28:10 +08:00 |
jiaoyangna
|
39dbd3f640
|
逍遥游幸运转盘提交
|
2020-10-30 13:27:45 +08:00 |
yuanshuai
|
1eba61731e
|
【逍遥游】首通奖励显示脚本提交
|
2020-10-30 11:03:50 +08:00 |
yuanshuai
|
ec3defb2c4
|
【逍遥游】首通奖励协议提交
|
2020-10-30 11:03:39 +08:00 |
zhangqiang
|
018c571a93
|
【大闹天宫】 试炼节点 战斗结束掉英雄报错卡死
|
2020-10-30 10:27:57 +08:00 |
jiaoyangna
|
1e2688e84c
|
【运筹帷幄】乾坤宝盒活动详情中的概率公示,少一个魂印
|
2020-10-30 10:09:11 +08:00 |
jiaoyangna
|
4b88ce6eb3
|
【运筹帷幄】限时召唤界面,up将白片
|
2020-10-30 10:09:04 +08:00 |
zhangqiang
|
c4a9cb99cf
|
【主题活动】commit
|
2020-10-30 10:08:54 +08:00 |
zhangqiang
|
6c1cf4de1a
|
【运筹帷幄】1
|
2020-10-30 10:08:41 +08:00 |
JieLing
|
48bf02ce81
|
【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店
|
2020-10-27 19:29:35 +08:00 |
ZhangBiao
|
31edeb3ab5
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-27 16:32:53 +08:00 |
ZhangBiao
|
33e1ba20e8
|
【社稷大典】商店适配
|
2020-10-27 16:32:43 +08:00 |
JieLing
|
0752b7694e
|
【排行榜】 排行榜显示
|
2020-10-27 16:23:35 +08:00 |
ZhangBiao
|
35f6a6c430
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta
|
2020-10-27 16:16:10 +08:00 |
ZhangBiao
|
acd3f336e9
|
【设计大典】特效添加
|
2020-10-27 16:15:34 +08:00 |
gaoxin
|
ec7e498b87
|
【战斗】修复持续伤害会出现小数的问题
|
2020-10-27 15:16:04 +08:00 |
gaoxin
|
9add8d8dbf
|
【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题)
|
2020-10-27 13:53:32 +08:00 |
JieLing
|
4b522dd9ea
|
【积天豪礼】$1 -> $0.99
|
2020-10-27 13:51:11 +08:00 |
JieLing
|
e1a8028ec6
|
【资源】部分资源位置修改,防止热更资源过大
|
2020-10-27 11:03:08 +08:00 |
gaoxin
|
9808cad9b9
|
【逍遥游】骰子音效替换
|
2020-10-26 20:20:51 +08:00 |
gaoxin
|
88516ad0e2
|
【战斗】加血普攻会触发降怒被动的问题,修改被动技能195全部免疫改为部分免疫
|
2020-10-26 19:43:04 +08:00 |
JieLing
|
7870934f0c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 18:58:03 +08:00 |
yuanshuai
|
0ea67ffa33
|
【逍遥游】骰子动画优化,隐藏动画下面的黑影
|
2020-10-26 18:57:45 +08:00 |
jiaoyangna
|
29789b6c0d
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 18:45:12 +08:00 |
jiaoyangna
|
5d3d65871a
|
[主题活动-社稷大典]商店立绘重叠提交
|
2020-10-26 18:44:57 +08:00 |
ZhangBiao
|
3d19d05b04
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 18:07:40 +08:00 |
ZhangBiao
|
d7ad797ce5
|
【车迟斗法】点击抢夺下方名字修改
|
2020-10-26 18:07:28 +08:00 |
JieLing
|
837d7d8886
|
【社稷大典】 公会排行显示问题
|
2020-10-26 17:59:58 +08:00 |
ZhangBiao
|
6eea05fa06
|
【竞技场】领奖界面报错修改
|
2020-10-26 17:30:26 +08:00 |
ZhangBiao
|
6149e88620
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 17:04:28 +08:00 |
ZhangBiao
|
c2612e2ca8
|
【社稷大典】捐献后 左上角 按钮状态切换修复
|
2020-10-26 17:04:07 +08:00 |
JieLing
|
0b8abaeabf
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:51:53 +08:00 |
jiaoyangna
|
d8f5a48811
|
【累计充值】提示修改
|
2020-10-26 16:51:47 +08:00 |
ZhangBiao
|
a9e8cad755
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:50:03 +08:00 |
ZhangBiao
|
5a20d41b77
|
【社稷大典】左上公会排行空白修改
|
2020-10-26 16:49:47 +08:00 |
JieLing
|
a33ac4576f
|
添加一个特效打包路径
|
2020-10-26 16:45:43 +08:00 |
ZhangBiao
|
0340b7d468
|
【社稷大典】打开社稷大典界面 时被提出公会 检测
|
2020-10-26 16:37:56 +08:00 |
ZhangBiao
|
b2c841e572
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 16:11:11 +08:00 |
ZhangBiao
|
709dc1a5bd
|
【社稷大典】时间弹跳修复,物品边框颜色修改
|
2020-10-26 16:10:58 +08:00 |
liujiaqi
|
e80c0f8e0d
|
【社稷大典】商店标题资源替换
|
2020-10-26 16:06:55 +08:00 |
JieLing
|
21f0e6abfb
|
【逍遥游】动画资源引用错误
|
2020-10-26 15:46:24 +08:00 |
JieLing
|
0b2a309b60
|
【逍遥游】删除旧骰子资源
|
2020-10-26 15:39:49 +08:00 |
gaoxin
|
76dadc8077
|
【逍遥游】合并后资源缺失
|
2020-10-26 15:30:24 +08:00 |
yuanshuai
|
0fee60ea37
|
【逍遥游】骰子动画修改
|
2020-10-26 15:19:33 +08:00 |
gaoxin
|
71dc347456
|
【逍遥游】删除旧骰子动画,修复新动画缺失的问题
|
2020-10-26 15:18:32 +08:00 |
gaoxin
|
c2db80b5bf
|
【逍遥游】骰子资源提交
|
2020-10-26 15:15:56 +08:00 |
jiaoyangna
|
942849cdcf
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-26 15:06:24 +08:00 |
jiaoyangna
|
ce5db82250
|
乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改
|
2020-10-26 15:05:59 +08:00 |
zhangqiang
|
0a5816a4ec
|
线上问题工会技能战力修改
|
2020-10-26 14:47:14 +08:00 |
zhangqiang
|
b6f48c4910
|
线上战力 属性取整问题
|
2020-10-26 14:46:43 +08:00 |
jiaoyangna
|
b1d1aadec7
|
伏虎罗汉 修改
|
2020-09-17 12:37:43 +08:00 |
jiaoyangna
|
2df6f4076e
|
[变幻莫测] 资源提交
|
2020-09-17 12:37:02 +08:00 |
jiaoyangna
|
2e4e34ef8d
|
灵兽宝阁
|
2020-09-17 12:36:43 +08:00 |
zhangqiang
|
6a0a52997c
|
变幻莫测 提交
|
2020-09-17 12:35:45 +08:00 |
zhangqiang
|
3292605ff6
|
【资源导入】 音效替换 2 个
|
2020-12-05 15:18:13 +08:00 |
zhangqiang
|
07cbb5f14f
|
【资源导入】 音效 三个
|
2020-12-05 15:18:06 +08:00 |
zhangqiang
|
e5b9abe11a
|
【资源导入】 live2d 新将 + 新灵兽
|
2020-12-05 15:17:56 +08:00 |
zhangqiang
|
ccb41e0c15
|
【资源导入】 新将小icon 静态卡牌例会 + 三个灵兽特效
|
2020-12-05 15:17:48 +08:00 |
zhangqiang
|
b1e1fdcab0
|
【巅峰赛 bug】 竞猜修改2 + 巅峰赛结束后 竞猜界面没有刷新问题修改
|
2020-12-05 13:31:39 +08:00 |
zhangqiang
|
01fd511ea1
|
【巅峰赛】 竞猜结果前端显示错误
|
2020-12-05 13:31:14 +08:00 |
zhangqiang
|
ab30b910b0
|
【背包 bug】 装备页签显示的 当前数量 不应是种类 是总数量 修复
|
2020-12-05 13:29:47 +08:00 |
zhangqiang
|
3de1b43922
|
【神将升级 优化】 觉醒提示文字修改
|
2020-12-05 13:29:32 +08:00 |
zhangqiang
|
6654c9c3b8
|
【大闹天宫】 新增需求 增加圣物 新标 提示
|
2020-12-05 13:20:42 +08:00 |
zhangqiang
|
1629164837
|
【竞技场】 防守记录积分显示修改
|
2021-01-19 23:00:35 +08:00 |
ZhangBiao
|
383fa08e90
|
【竞技场】赢了我加分对方减分,输了无变化
(cherry picked from commit 8f7cf8ca39dd8395a5b2b46eadb8d4f575289ce5)
|
2021-01-14 21:14:04 +08:00 |
jiaoyangna
|
be56177071
|
伏虎罗汉 修改
|
2020-09-17 12:25:03 +08:00 |
jiaoyangna
|
f602a40132
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-20 06:44:30 +08:00 |
ZhangBiao
|
e3bd258f8d
|
【新将来袭】立绘更改
|
2020-12-07 10:45:07 +08:00 |
ZhangBiao
|
620862f64f
|
Merge branch '0活动开发聚集地/新将来袭' into master_develop
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_01.prefab.meta
# Assets/ManagedResources/Prefabs/Live2d/live2d_c_bgj_00091.prefab
# Assets/ManagedResources/Prefabs/Live2d/live2d_c_mjn_00063.prefab.meta
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua
|
2020-12-07 10:33:26 +08:00 |
zhangqiang
|
626099d62d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-05 15:17:23 +08:00 |
zhangqiang
|
4dc5059bed
|
【战斗 】 给英雄附加战斗单位类型
|
2020-12-05 15:16:54 +08:00 |
wangzhenxing
|
d92e67a866
|
[战斗] 修改灵兽给英雄附加的buff的刷新机制,改为大回合刷新,如果灵兽是在回合后释放,配置的持续回合数+1
|
2020-12-05 15:14:02 +09:00 |
zhangqiang
|
8388b950ff
|
【巅峰赛 bug】 三局两胜 第三场不刷新bug 2
|
2020-12-05 14:01:46 +08:00 |
wangzhenxing
|
cf54cff4b8
|
[战斗] 神女庇佑最佳技能表现修改,吞鲸魂印修改
|
2020-12-04 16:43:42 +09:00 |
jiaoyangna
|
4b2ffbdfae
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-20 05:21:38 +08:00 |
jiaoyangna
|
0def846f60
|
金乌 立绘资源提交
|
2020-09-20 05:21:32 +08:00 |
jiaoyangna
|
ed6842d354
|
[变幻莫测] 资源提交
|
2020-09-20 00:15:43 +08:00 |
jiaoyangna
|
665e8f8d42
|
灵兽宝阁
|
2020-09-18 11:51:20 +08:00 |
jiaoyangna
|
85bd3ae52b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-18 10:48:46 +08:00 |
zhangqiang
|
21683ce406
|
【神将升级 优化】 觉醒提示文字修改
|
2020-12-05 10:10:41 +08:00 |
gaoxin
|
7417f279bb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-03 17:10:29 +08:00 |
gaoxin
|
18e6ce1181
|
【战斗】被动技能outdata添加胜利场数数据,修改被动225根据胜利场数计算,
|
2020-12-03 17:10:24 +08:00 |
zhangqiang
|
253c80412f
|
【资源导入】 音效替换 2 个
|
2020-12-03 15:52:51 +08:00 |
ZhangBiao
|
491d770619
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-03 15:18:39 +08:00 |
ZhangBiao
|
27b178a215
|
【青龙秘宝】购买等级为0修改
|
2020-12-03 15:18:30 +08:00 |
zhangqiang
|
b7103ae709
|
百上回时间调整
|
2020-12-03 15:03:52 +08:00 |
zhangqiang
|
593aa53688
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-03 15:01:02 +08:00 |
zhangqiang
|
26d1bba3dc
|
变幻莫测 提交
|
2020-12-03 15:00:49 +08:00 |
gaoxin
|
527e6f2245
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-03 11:45:03 +08:00 |
gaoxin
|
9eaf7f8d6b
|
【战斗】修复回收机制错误,导致立绘重叠的问题,删除无用log
|
2020-12-03 11:44:57 +08:00 |
zhangqiang
|
32d2fd1c66
|
【资源导入】 音效 三个
|
2020-12-03 11:38:15 +08:00 |
liujiaqi
|
e6c834e309
|
新增3个灵兽小头像
|
2020-12-07 11:02:59 +08:00 |
zhangqiang
|
e8a1e94830
|
【背包 bug】 装备页签显示的 当前数量 不应是种类 是总数量 修复
|
2020-12-02 20:39:28 +08:00 |
zhangqiang
|
c0f208b7d1
|
【巅峰赛 bug】 三局两胜 第三场不刷新bug
|
2021-01-21 21:33:36 +08:00 |
zhangqiang
|
852694c967
|
【竞技场】 防守记录积分显示修改
|
2021-01-19 23:00:13 +08:00 |
gaoxin
|
b83f326e5f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-02 17:08:12 +08:00 |
zhangqiang
|
9e8b497537
|
【资源导入】 live2d 新将 + 新灵兽
|
2021-01-19 21:49:12 +08:00 |
zhangqiang
|
47c6e02d56
|
【资源导入】 新将小icon 静态卡牌例会 + 三个灵兽特效
|
2021-01-17 21:45:17 +08:00 |
gaoxin
|
0b1b24bbc2
|
【策划】添加灵兽立绘位置调整
|
2020-12-02 17:07:49 +08:00 |
ZhangBiao
|
4b0332f12c
|
【竞技场】赢了我加分对方减分,输了无变化
(cherry picked from commit 8f7cf8ca39dd8395a5b2b46eadb8d4f575289ce5)
|
2020-12-02 10:35:44 +08:00 |
zhangqiang
|
c77327b1f0
|
【巅峰赛 bug】 竞猜修改2 + 巅峰赛结束后 竞猜界面没有刷新问题修改
|
2020-12-31 22:59:34 +08:00 |
ZhangBiao
|
d2689eba03
|
【青龙秘宝】修复延时
(cherry picked from commit 758c59dcae)
|
2020-12-01 15:59:15 +08:00 |
zhangqiang
|
972e83ec2f
|
【巅峰赛】 竞猜结果前端显示错误
|
2020-12-14 00:20:10 +08:00 |
gaoxin
|
f5823409cf
|
【角色】修复角色被动技能数量计算错误,兼容多合一被动
|
2020-11-30 21:17:24 +08:00 |
gaoxin
|
2f857869de
|
【战斗】修复lenthoftable方法在后端战斗中无法调用导致报错
|
2020-11-30 19:43:37 +08:00 |
gaoxin
|
98900329fc
|
【战斗】尝试修复退出战斗界面,资源回收错误,偶现报错的问题
|
2020-11-30 14:18:02 +08:00 |
gaoxin
|
d3c6c76fb1
|
【GM工具】添加添加圣物的GM
|
2020-11-30 14:17:12 +08:00 |
gaoxin
|
d1ba9b766e
|
【黑名单】修复跳转黑名单报错
|
2020-11-30 10:27:07 +08:00 |
wangzhenxing
|
560b58480d
|
[战斗] 99被动修改 屏蔽金翅大鹏不灭
|
2020-11-28 17:32:30 +09:00 |
zhangqiang
|
b0e4b6606e
|
【编队战力】 修改战力显示 2 未合 local
|
2020-11-28 17:20:44 +08:00 |
zhangqiang
|
a6339681ab
|
【编队战力】 编队界面的那个英雄战力计算修改
|
2020-11-28 17:13:01 +08:00 |
wangzhenxing
|
08f8a0ba9e
|
【战斗】 角色查找逻辑添加 排除拥有不灭的单位 和 没有不灭的无序列表 103效果改成治疗随机多个单位 276被动 改为给随机英雄加
|
2020-11-28 16:18:50 +09:00 |
zhangqiang
|
ac18c8e0d3
|
【uidata】
|
2020-11-28 15:15:39 +08:00 |
gaoxin
|
b6ce4c8840
|
【特效】三四星部分特效裁切处理
|
2020-11-27 17:34:35 +08:00 |
zhangqiang
|
60a168fe48
|
【车迟斗法】 修改抢夺 挑战时会报错修复
|
2020-11-27 16:34:34 +08:00 |
zhangqiang
|
7ff9932661
|
【竞技场】 修复积分规则修改别的pvp 战斗结束后报错 bug
|
2020-11-27 15:17:36 +08:00 |
gaoxin
|
998a085caa
|
Merge remote-tracking branch 'origin/0功能/系统消息结构处理' into master_develop
|
2020-11-27 15:08:46 +08:00 |
liujiaqi
|
87cfb4ed03
|
【技能】太极特效字更换为青丝
|
2020-12-06 14:02:48 +08:00 |
gaoxin
|
0378485c97
|
Merge remote-tracking branch 'origin/0功能/背包最大值限制提示添加' into master_develop
|
2020-11-27 14:01:17 +08:00 |
gaoxin
|
f98156b5cc
|
Merge remote-tracking branch 'origin/0功能/背包最大值限制提示添加' into master_develop
|
2020-11-27 13:41:44 +08:00 |
zhangqiang
|
ff49cae4bb
|
【车迟斗法】 我编队为空 或者 对方编队我空 逻辑处理
|
2020-11-27 11:45:31 +08:00 |
zhangqiang
|
1b68c9d93b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-27 11:04:07 +08:00 |
liujiaqi
|
1fa4626d47
|
【技能】3星技能文字
|
2020-12-06 10:56:02 +08:00 |
zhangqiang
|
79fb88aa93
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-27 11:03:33 +08:00 |
gaoxin
|
681a030c45
|
【资源】特效技能音效更新
|
2020-11-26 20:09:21 +08:00 |
jiaoyangna
|
9626006a2b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-20 17:09:15 +08:00 |
gaoxin
|
04a1291830
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-26 17:05:00 +08:00 |
gaoxin
|
54c82824a0
|
【音效】技能音效更新
|
2020-11-26 17:04:47 +08:00 |
ZhangBiao
|
1dcb1a8eb2
|
【编队优化】切磋增加一键
(cherry picked from commit e7a178aa0d99c0e9257c029ecabac2dac0a9b9d4)
|
2020-11-26 16:08:48 +08:00 |
wangzhenxing
|
6f3d3e0f38
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-26 15:48:29 +09:00 |
wangzhenxing
|
febcd00a5f
|
【战斗】效果:103修改添加1个参数 被动 147 206修改 被动添加271-284
|
2020-11-26 15:48:15 +09:00 |
ZhangBiao
|
101c23c794
|
Merge branch '0功能/竞技场胜负奖励' into master_develop
|
2020-11-26 14:29:54 +08:00 |
gaoxin
|
b1ab868a17
|
【适配】添加ui默认实际大小
|
2020-11-26 11:22:56 +08:00 |
gaoxin
|
3692b7d6f8
|
【音效】三四星英雄技能音效优化
|
2020-11-26 11:21:07 +08:00 |
gaoxin
|
d8566aaea4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-26 00:32:55 +08:00 |
DESKTOP-98AVA47\Administrator
|
175edb6219
|
【鸿蒙阵】添加界面
|
2020-11-25 20:39:48 +08:00 |
gaoxin
|
defcf8684e
|
【工具】特效资源整理工具优化
|
2020-11-25 17:11:02 +08:00 |
gaoxin
|
ef682f80a4
|
【sdk】添加自定义事件上传接口,并将所有的按钮点击事件上传
|
2020-11-25 17:09:35 +08:00 |
gaoxin
|
b382a91ba8
|
【资源】孟姜女立绘删除老旧资源
|
2020-11-25 15:58:22 +08:00 |
gaoxin
|
aec7dbd25d
|
【屏幕适配】修改ipad适配的方式
|
2020-11-25 15:11:04 +08:00 |
gongjiawei
|
955af5caa9
|
音频更新
|
2020-11-25 14:17:23 +08:00 |
gaoxin
|
82d325bb59
|
【特效】孟姜女技能裁切处理
|
2020-11-24 20:35:53 +08:00 |
gaoxin
|
d8be2456ea
|
【战斗】修复技能单回合限制会导致战斗卡死的问题
|
2020-11-24 19:18:59 +08:00 |
gaoxin
|
e3429b5547
|
【资源】三四星技能音效添加
|
2020-11-24 14:32:53 +08:00 |
wangzhenxing
|
26519a2158
|
[战斗] 91 112 115 196 256 被动添加特性屏蔽修改
|
2020-11-23 15:08:22 +09:00 |
zhangqiang
|
8bc7d38cb5
|
【特效】 巨锟 皮丘
|
2020-11-23 14:26:03 +08:00 |
gaoxin
|
393dfb6c0d
|
【资源】特效节点改为recttransform
|
2020-11-20 19:23:11 +08:00 |
gaoxin
|
bdde50f26a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-20 18:42:49 +08:00 |
gaoxin
|
908fdc05a8
|
【资源】迦楼罗,聂小倩特效修改
|
2020-11-20 18:42:39 +08:00 |
zhangqiang
|
298d19ef1a
|
【孟姜女】特效替换
|
2020-11-20 18:21:48 +08:00 |
gaoxin
|
a4315b19a1
|
【资源】名称重复修改
|
2020-11-20 16:29:29 +08:00 |
gaoxin
|
2b2df7a106
|
【资源】孟姜女,迦楼罗特效资源修改,幽魂姬资源新增
|
2020-11-20 16:16:56 +08:00 |
gaoxin
|
d0c0cd3f2c
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-20 15:39:30 +08:00 |
wangzhenxing
|
53e473c325
|
【战斗】147,206被动修改回原来的效果
|
2020-11-20 10:00:16 +09:00 |
wangzhenxing
|
6ce8000c0b
|
[战斗] 245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题
|
2020-11-19 20:24:30 +09:00 |
gaoxin
|
1a88c57864
|
Merge remote-tracking branch 'origin/master_xma_local' into master_develop
|
2020-11-19 15:44:53 +08:00 |
gaoxin
|
b516397443
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-19 14:54:12 +08:00 |
gaoxin
|
680e3eb9e6
|
【资源】阿修罗特效裁切问题修改
|
2020-11-19 14:51:48 +08:00 |
gaoxin
|
8c692349db
|
【资源】修复聂小倩光效切割问题,修复阿修罗释放特效错误的问题
|
2020-11-19 14:37:51 +08:00 |
gaoxin
|
a96b128965
|
【资源】鬼差,木吒,水德星君光效切割问题修复
|
2020-11-19 13:52:44 +08:00 |
gongjiawei
|
06b3930263
|
音频更新
|
2020-11-18 17:35:12 +08:00 |
gaoxin
|
6be65652c5
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-17 20:40:29 +08:00 |
gaoxin
|
ea5afc1ac3
|
【战斗】无用log删除
|
2020-11-17 20:40:23 +08:00 |
gaoxin
|
f7676f2c93
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_01.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_02.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_03.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/H_shandian_82.tga.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014_mat.mat.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Texture/H_shandian_82.tga.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Texture/H_shandian_82_tga.tga.meta
|
2020-11-17 18:38:24 +08:00 |
zhangqiang
|
7cf3d312d2
|
【特效】 特效添加RectTransform
|
2020-11-17 17:04:19 +08:00 |
gaoxin
|
479c836292
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-17 15:14:31 +08:00 |
ZhangBiao
|
2dd30f9ca3
|
【森罗幻境】敌将详情 敌将位置调整
|
2020-11-17 14:55:21 +08:00 |
ZhangBiao
|
88d1be5daf
|
Revert "【森罗幻境】敌将详情 敌将位置调整"
This reverts commit f1402772f9.
|
2020-11-17 14:53:27 +08:00 |
ZhangBiao
|
f1402772f9
|
【森罗幻境】敌将详情 敌将位置调整
|
2020-11-17 14:51:25 +08:00 |
ZhangBiao
|
db9facba90
|
【天宫秘宝】领取宝箱积分后秘宝红点不刷新修复
(cherry picked from commit 04f8571692)
|
2020-11-17 11:54:58 +08:00 |
ZhangBiao
|
90f0ea6b67
|
【灵兽宝阁】单抽十连奖励获得界面上方货币显示不正确修复
(cherry picked from commit 69d818118c)
|
2020-11-17 10:59:48 +08:00 |
ZhangBiao
|
e6d0c6b0f2
|
【公告】打开公告前获取公告信息
|
2020-11-17 10:58:54 +08:00 |
gaoxin
|
9c158f1f99
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
|
2020-11-16 20:16:17 +08:00 |
zhangqiang
|
a22effc57c
|
【东华帝君】 音效替换 技能预设 修改
|
2020-11-16 18:08:01 +08:00 |
ZhangBiao
|
bef1181f19
|
【灵兽宝阁】今日召唤上限次数不对修改
(cherry picked from commit 38e625aba1eee93177e41293eb35668cb3b6c3a2)
|
2020-11-16 17:50:46 +08:00 |
gaoxin
|
5ab9688089
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-16 16:46:33 +08:00 |
zhangqiang
|
51c7033220
|
【东华帝君】 音效提交
|
2020-11-16 15:48:29 +08:00 |
gaoxin
|
64dc9d0181
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-16 11:51:44 +08:00 |
gaoxin
|
6639b42bed
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-16 10:13:01 +08:00 |
gaoxin
|
8b001af5b6
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/Atlas/RoleInfoAtlas/r_hero_juexinchengong.png.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
|
2020-11-13 19:48:27 +08:00 |
gaoxin
|
f17d8daa9f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-13 17:25:47 +08:00 |
gaoxin
|
a62598207c
|
【测试战斗】修复添加属性被动时报错
|
2020-11-13 17:25:40 +08:00 |
ZhangBiao
|
10b3c375e7
|
【灵兽宝阁】增加假战斗
(cherry picked from commit 933f2d4768)
|
2020-11-13 16:38:41 +08:00 |
ZhangBiao
|
1e5e64db1e
|
【灵兽宝阁】倒计时显示刷新问题修复
(cherry picked from commit d739896793)
|
2020-11-13 16:36:13 +08:00 |
gaoxin
|
9e49e3e5ce
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-13 16:06:42 +08:00 |
gaoxin
|
779f61cc15
|
【封禁】添加封禁提示
|
2020-11-13 16:06:35 +08:00 |
wangzhenxing
|
7129226ff4
|
257,261,267被动修改
|
2020-11-13 16:05:56 +09:00 |
liujiaqi
|
762e35b2c1
|
灵兽山 觉醒图标
|
2020-11-20 15:24:41 +08:00 |
gaoxin
|
523e5c7328
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-13 14:51:19 +08:00 |
gaoxin
|
59a62755c8
|
【资源】修复东华帝君普攻技能报错的问题
|
2020-11-13 14:51:00 +08:00 |
ZhangBiao
|
c2933ddb96
|
Merge branch '0活动开发聚集地/灵兽抽卡(可更换兽)' into master_develop
# Conflicts:
# Assets/ManagedResources/BG/lingshou_lingshoubeijing_03.jpg.meta
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
|
2020-11-13 14:20:49 +08:00 |
ZhangBiao
|
8185be7c27
|
【灵兽抽卡】增加可选灵兽
|
2020-11-13 12:12:06 +08:00 |
gaoxin
|
31378d1a76
|
【工具】刷新资源路径工具不再自动重命名
|
2020-11-13 11:30:50 +08:00 |
gaoxin
|
26cbfccf57
|
【工具】特效资源整理工具
|
2020-11-13 11:30:01 +08:00 |
wangzhenxing
|
bb4dfa322c
|
【技能】被动265修改
|
2020-11-13 12:22:33 +09:00 |
wangzhenxing
|
2ed9f538b3
|
[技能] 被动效果修改
|
2020-11-13 10:40:39 +09:00 |
wangzhenxing
|
a1315561e1
|
被动修改提交
|
2020-11-12 20:22:52 +09:00 |
gaoxin
|
8fe495cf88
|
【战斗】修复获取空的灵兽数据报错的问题
|
2020-11-12 19:42:31 +08:00 |
gaoxin
|
b606e5bb97
|
【音效】孙悟空普通攻击音效提交
|
2020-11-12 18:22:10 +08:00 |
gaoxin
|
ee9f3af6bb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-12 18:12:33 +08:00 |
zhangqiang
|
33a40c700d
|
【献祭坛】 适配修改
|
2020-11-12 16:57:50 +08:00 |
zhangqiang
|
5da1841a03
|
【灵兽】灵兽上阵主界面名字颜色变化
|
2020-11-12 16:56:40 +08:00 |
gaoxin
|
ba30732766
|
【特效】再次修复孙悟空技能特效丢失的问题
|
2020-11-12 16:39:45 +08:00 |
gaoxin
|
93191b45b0
|
【资源】删除无用的灵兽合成界面背景资源
|
2020-11-12 15:34:56 +08:00 |
wangzhenxing
|
c4af6714bc
|
额外配置技能添加
|
2020-11-12 15:16:30 +09:00 |
gaoxin
|
ec8a14004a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-12 15:11:00 +08:00 |
gaoxin
|
db20230131
|
【战斗】假战斗加入对MonsterGroup配置的灵兽数据的处理
|
2020-11-12 15:10:53 +08:00 |
zhangqiang
|
a5f744261b
|
【觉醒】bug 修改 公会成员灵兽显示错误
|
2020-11-12 14:38:01 +08:00 |
zhangqiang
|
1615d0c2d2
|
【觉醒】问题修改
|
2020-11-12 13:55:15 +08:00 |
wangzhenxing
|
6a5a18eadd
|
被动描述修改提交
|
2020-11-12 11:31:25 +09:00 |
gaoxin
|
ea3be3e709
|
【本地化】修复代码本地化工具会重复导出包含转义字符的文本的问题
|
2020-11-12 10:47:25 +08:00 |
zhangqiang
|
e0c8ecfba8
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_01.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_02.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_03.prefab
|
2020-11-11 20:33:41 +08:00 |
zhangqiang
|
82a2d14bb6
|
【觉醒】bug
|
2020-11-11 20:19:54 +08:00 |
zhangqiang
|
dcde0cf4ce
|
【灵兽提交】bug修改
|
2020-11-11 19:50:49 +08:00 |
zhangqiang
|
904b2dbe3a
|
【技能特效】 提交11.11
|
2020-11-11 17:00:04 +08:00 |
wangzhenxing
|
d54fb77bda
|
【战斗】新增觉醒被动效果
|
2020-11-11 16:38:37 +09:00 |
gaoxin
|
14bab99f0e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-11 15:31:10 +08:00 |
gaoxin
|
e6dec38b64
|
【本地化】添加一些测试代码
|
2020-11-11 15:31:05 +08:00 |
zhangqiang
|
f746575b10
|
Merge branch '0功能/神将觉醒' into master_develop
|
2020-11-11 11:38:43 +08:00 |
ZhangBiao
|
793bc58af8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-10 16:47:00 +08:00 |
ZhangBiao
|
5a8d009f39
|
【易经宝库】漏题
(cherry picked from commit ebe03eff48)
(cherry picked from commit a2db78b1541b8ab9fc83bf53c7af2661c91216bb)
|
2020-11-10 16:46:54 +08:00 |
ZhangBiao
|
5a075c4fb5
|
【易经宝库】抽取灵兽报错修复
|
2020-11-10 16:27:31 +08:00 |
gongjiawei
|
8a2dbd23be
|
音频更新
|
2020-11-10 15:36:41 +08:00 |
gongjiawei
|
55b629e576
|
白泽灵兽语音修改
|
2020-11-10 15:09:41 +08:00 |
liujiaqi
|
92ff0628c5
|
定卦神锄资源
|
2020-11-16 14:51:41 +08:00 |
gaoxin
|
5a6b83ebe6
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/Language.lua
|
2020-11-10 10:41:02 +08:00 |
gaoxin
|
ab82dce46d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-10 10:25:00 +08:00 |
gaoxin
|
a7f51b5431
|
【音效】孙悟空技能音效添加
|
2020-11-10 10:24:42 +08:00 |
liujiaqi
|
89c73695e2
|
定卦神锄新图标上传
|
2020-11-15 17:31:15 +08:00 |
zhangqiang
|
10db1d34b3
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:17:42 +08:00 |
zhangqiang
|
d3283d8094
|
【神将升级】 太快优化
|
2020-11-09 16:29:22 +08:00 |
ZhangBiao
|
ed806f2707
|
【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复
(cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025)
|
2020-11-09 16:11:13 +08:00 |
wangzhenxing
|
a09870522a
|
[皮肤]伤害统计界面添加皮肤显示
|
2020-11-09 15:52:43 +09:00 |
ZhangBiao
|
454a70668d
|
【易经宝库】格子点击位置不准确修复 曾加tips
|
2020-11-09 15:39:25 +08:00 |
zhangqiang
|
e72cac2afb
|
【逍遥游】 通关后返回问题修复
|
2020-11-09 15:25:02 +08:00 |
ZhangBiao
|
181fe789a4
|
【易经宝库】最终奖励选择bug修复
(cherry picked from commit c4745e8c7c)
|
2020-11-09 13:48:08 +08:00 |
ZhangBiao
|
82dc9fac73
|
【易经宝库】第三层抽取完成后bug修复
(cherry picked from commit 9ca403ebff)
|
2020-11-09 11:12:28 +08:00 |
wangzhenxing
|
bcabd3b36d
|
gm 测试战斗添加设置皮肤
|
2020-11-09 10:12:45 +09:00 |
jiaoyangna
|
351785e3fc
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2020-11-06 21:11:18 +08:00 |
gaoxin
|
4622263234
|
【战斗】修复战斗中受击特效及音效错误的问题,修复假战斗星级显示错误
|
2020-11-06 20:45:21 +08:00 |
gaoxin
|
53b6f4483f
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_yl_vo_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_zl_vo_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh03.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_hd01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_ql01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl02.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl03.mp3.meta
# Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png.meta
# Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png.meta
# Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png.meta
# Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2020-11-06 19:56:52 +08:00 |
JieLing
|
2a65148fe9
|
【资源】重名资源修改
|
2020-11-06 17:57:34 +08:00 |
wangzhenxing
|
04deaa28d6
|
[皮肤] 胜利最佳输出界面显示皮肤
|
2020-11-06 17:52:54 +09:00 |
gaoxin
|
6e42f78073
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-06 17:44:33 +08:00 |
gaoxin
|
5220756ff3
|
【音效】灵兽音效误删恢复
|
2020-11-06 17:44:26 +08:00 |
ZhangBiao
|
73c94dee90
|
Merge branch '0活动开发聚集地/易经宝库' into master_develop
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials.meta
# Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
# Assets/ManagedResources/Effects/Model/Materials.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-11-06 17:34:27 +08:00 |
zhangqiang
|
2ed3fc9fc5
|
【达人奖励排行】 显示问题修复
|
2020-11-06 17:19:14 +08:00 |
gaoxin
|
f9214aa9fe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-06 16:54:51 +08:00 |
gaoxin
|
3baf785576
|
【角色信息】修复角色信息界面滑动立绘报错的问题
|
2020-11-06 16:54:38 +08:00 |
zhangqiang
|
2e470d6ef6
|
【易经宝库】 特效层级调整
(cherry picked from commit ac64980843)
|
2020-11-06 16:52:57 +08:00 |