gaoxin
|
e6ac0a8845
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-14 17:20:38 +08:00 |
gaoxin
|
b7269ccf89
|
【测试战斗】修复测试战斗按钮层级过高遮挡伤害数字的问题
|
2020-11-14 17:20:33 +08:00 |
wangzhenxing
|
d64ed5e92d
|
[战斗] 268 被动效果修改
|
2020-11-14 17:32:09 +09:00 |
wangzhenxing
|
5e0384b847
|
[战斗]免疫盾修改提交
|
2020-11-14 17:13:37 +09:00 |
wangzhenxing
|
6821324fb1
|
[战斗]减伤盾效果修改提交
|
2020-11-14 15:43:40 +09:00 |
wangzhenxing
|
deb8603b98
|
[战斗]减伤盾效果修改
|
2020-11-14 15:11:32 +09:00 |
gaoxin
|
4fd822a333
|
【战斗】删除战斗艺术字配置,改为即时判断
|
2020-11-13 19:44:55 +08:00 |
gaoxin
|
142d8dee0f
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 19:38:10 +08:00 |
gaoxin
|
56afe786be
|
【战斗】战斗关闭时不再回收灵兽立绘资源,直接销毁,避免在UI上立绘不停播放攻击动作的问题
|
2020-11-13 19:38:04 +08:00 |
gaoxin
|
1face65dbb
|
【战斗】免疫效果自定义类型添加,免疫效果文字显示恢复
|
2020-11-13 19:34:41 +08:00 |
ZhangBiao
|
9424037d9e
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 18:58:47 +08:00 |
ZhangBiao
|
4a0a702fec
|
【灵兽宝阁】凤凰无限飞bug缓解
|
2020-11-13 18:58:35 +08:00 |
ZhangBiao
|
6c8a011528
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 18:01:05 +08:00 |
ZhangBiao
|
46eeceb79d
|
【主题活动】bug修复
|
2020-11-13 18:00:56 +08:00 |
wangzhenxing
|
70e019f837
|
gm 测试战斗添加设置皮肤
|
2020-11-13 17:48:11 +08:00 |
gaoxin
|
bd083a67a3
|
【测试战斗】同步界面修改
|
2020-11-13 17:47:54 +08:00 |
wangzhenxing
|
fee4501004
|
[战斗] 266被动修改
|
2020-11-13 18:42:27 +09:00 |
wangzhenxing
|
d6d5f5cdfa
|
257 561 267 技能修改
|
2020-11-13 17:38:35 +08:00 |
gaoxin
|
1568e2f288
|
【测试战斗】修复添加属性被动时报错
|
2020-11-13 17:27:15 +08:00 |
wangzhenxing
|
8a87f0a8a2
|
【战斗】91 被动修改
|
2020-11-13 18:23:56 +09:00 |
ZhangBiao
|
f091914b4f
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 17:07:44 +08:00 |
ZhangBiao
|
ee04d93830
|
【灵兽宝阁】增加结束时间
|
2020-11-13 17:07:32 +08:00 |
jiaoyangna
|
97cdd13df9
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 16:35:29 +08:00 |
jiaoyangna
|
384750e0e9
|
[限时折扣] 修改
|
2020-11-13 16:35:25 +08:00 |
ZhangBiao
|
933f2d4768
|
【灵兽宝阁】增加假战斗
|
2020-11-13 16:25:42 +08:00 |
ZhangBiao
|
e4f48eb668
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 16:10:34 +08:00 |
ZhangBiao
|
d739896793
|
【灵兽宝阁】倒计时显示刷新问题修复
|
2020-11-13 16:10:26 +08:00 |
jiaoyangna
|
f1dfa111f1
|
灵兽特惠 价格修改
|
2020-11-13 15:56:21 +08:00 |
jiaoyangna
|
d4f79a0abb
|
限时招募提交
|
2020-11-13 15:50:42 +08:00 |
jiaoyangna
|
29312b211f
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 15:47:11 +08:00 |
jiaoyangna
|
44a1d94860
|
神医天降修改
|
2020-11-13 15:47:04 +08:00 |
JieLing
|
2cb5ee9176
|
【放生】 删除之前背景
|
2020-11-13 15:23:25 +08:00 |
ZhangBiao
|
8a5d51e2a3
|
【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27)
|
2020-11-13 12:12:44 +08:00 |
zhangqiang
|
21988be4e2
|
【觉醒】 觉醒成功替换资源
|
2020-11-13 11:18:46 +08:00 |
zhangqiang
|
2f5b2c2d4f
|
【觉醒】 觉醒成功界面显示bug
|
2020-11-13 10:11:41 +08:00 |
zhangqiang
|
e9d984b329
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-11-12 19:34:29 +08:00 |
ZhangBiao
|
debaf0210c
|
【易经宝库】加号位置调整
|
2020-11-12 18:32:53 +08:00 |
ZhangBiao
|
c5117b9fc1
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-12 18:18:33 +08:00 |
ZhangBiao
|
2563c6bdd6
|
【灵兽宝阁】货币显示修复
|
2020-11-12 18:17:56 +08:00 |
zhangqiang
|
8b15fe28eb
|
【献祭坛】11.5 资源提换
|
2020-11-12 18:12:02 +08:00 |
ZhangBiao
|
5f596eef04
|
【灵兽宝阁】bug修复,增加等级限制
|
2020-11-12 17:53:49 +08:00 |
ZhangBiao
|
32afdddb4f
|
【灵兽宝阁】合并到local 预设提交
|
2020-11-12 17:24:14 +08:00 |
ZhangBiao
|
2c143deea9
|
Merge branch '0活动开发聚集地/灵兽抽卡' into master_xma_local
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-11-12 17:21:42 +08:00 |
ZhangBiao
|
a5c36cf58a
|
【灵兽宝阁】未开启更换灵兽版本
|
2020-11-12 17:11:18 +08:00 |
zhangqiang
|
b1eba4887a
|
【灵兽】灵兽上阵主界面名字颜色变化
|
2020-11-12 17:05:50 +08:00 |
zhangqiang
|
b1128dd88e
|
【献祭坛】适配调试
|
2020-11-12 17:05:34 +08:00 |
zhangqiang
|
8a73056eac
|
【献祭坛】预设微调
|
2020-11-12 17:04:06 +08:00 |
jiaoyangna
|
7fc14ec822
|
[主题活动] 修改提交
|
2020-11-12 16:07:19 +08:00 |
gaoxin
|
da372f48df
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-12 15:13:38 +08:00 |
gaoxin
|
9919674980
|
【战斗】假战斗加入对MonsterGroup配置的灵兽数据的处理
|
2020-11-12 15:12:59 +08:00 |
jiaoyangna
|
358ecb8166
|
[玄机妙算] 提交
|
2020-11-12 15:10:52 +08:00 |
zhangqiang
|
492d969a4f
|
【觉醒】bug 修改 公会成员灵兽显示错误
|
2020-11-12 14:38:40 +08:00 |
zhangqiang
|
cbf9f5cade
|
【觉醒】问题修改
|
2020-11-12 13:55:46 +08:00 |
jiaoyangna
|
45c088e6b7
|
[灵兽特惠] 提交
|
2020-11-12 11:37:12 +08:00 |
jiaoyangna
|
7aa7244d06
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-12 11:31:49 +08:00 |
jiaoyangna
|
a6483b3181
|
[灵兽特惠] 提交
|
2020-11-12 11:31:33 +08:00 |
zhangqiang
|
0ca5e4ea13
|
【觉醒】bug
|
2020-11-11 20:21:37 +08:00 |
zhangqiang
|
adf9c87ac2
|
【灵兽提交】bug修改
|
2020-11-11 20:21:13 +08:00 |
gaoxin
|
0887de50d5
|
【特效】孙悟空普通攻击受击特效材质丢失修复
|
2020-11-11 20:13:01 +08:00 |
gaoxin
|
740cfa0e20
|
【特效】孙悟空技能特效材质丢失修复
|
2020-11-11 20:00:12 +08:00 |
gaoxin
|
74b6294c2a
|
【特效】孙悟空皮肤技能特效修改
|
2020-11-11 19:39:55 +08:00 |
zhangqiang
|
36f8d28974
|
【孙悟空技能】普工特效添加
|
2020-11-11 18:33:06 +08:00 |
gaoxin
|
4f635cf42d
|
【战斗】修复特效层级显示错误
|
2020-11-11 18:10:06 +08:00 |
ZhangBiao
|
1ba753044f
|
【灵兽宝阁】抽卡逻辑完善了
|
2020-11-11 16:53:04 +08:00 |
gaoxin
|
a65c528256
|
【GM】战斗种子数据类型错误
|
2020-11-11 16:10:21 +08:00 |
gaoxin
|
a3d6f49e15
|
【gm】修复战斗数据gm报错的问题
|
2020-11-11 16:04:01 +08:00 |
zhangqiang
|
629eb98f1b
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-11 11:37:26 +08:00 |
zhangqiang
|
90e9e84c64
|
【觉醒】十一星的星级展示修改
|
2020-11-11 11:12:14 +08:00 |
zhangqiang
|
053de93608
|
【神将觉醒】 提交
|
2020-11-10 18:35:37 +08:00 |
zhangqiang
|
48e6d33b7b
|
【神将觉醒】 效果图 资源 提交
|
2020-11-10 17:29:38 +08:00 |
ZhangBiao
|
ffd6ba5168
|
【易经宝库】漏题
|
2020-11-10 16:56:24 +08:00 |
ZhangBiao
|
ebe03eff48
|
【易经宝库】漏题
|
2020-11-10 16:43:24 +08:00 |
ZhangBiao
|
e9ad50ac90
|
【易经宝库】抽取灵兽报错修复
|
2020-11-10 16:28:47 +08:00 |
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 |
JieLing
|
87a0001023
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-11-10 15:46:45 +08:00 |
gaoxin
|
b8c6bf7a62
|
【白泽】音效修改
|
2020-11-10 15:46:26 +08:00 |
JieLing
|
44260c0321
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-11-10 15:29:03 +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 |
JieLing
|
66aa56da26
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-11-10 14:56:53 +08:00 |
liujiaqi
|
21248cf571
|
定卦神锄资源
|
2020-11-10 14:56:03 +08:00 |
JieLing
|
915d45b4b4
|
Revert "定卦神锄新图标上传"
This reverts commit 495ea6e24e.
|
2020-11-10 14:53:25 +08:00 |
JieLing
|
3e24ba9bcf
|
Revert "定卦神锄新图标上传"
This reverts commit 495ea6e24e.
|
2020-11-10 14:47:18 +08:00 |
JieLing
|
1967b0a5da
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-11-10 12:12:38 +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 |