ZhangBiao
|
0f0f08b260
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 11:52:45 +08:00 |
ZhangBiao
|
1c9d113a86
|
【活动、修为】界面调整
|
2021-11-25 11:52:35 +08:00 |
gaoxin
|
1a2a5e0c71
|
【普攻特效】人佛技能优化
|
2021-11-25 11:44:54 +08:00 |
gaoxin
|
25e77c3ce4
|
【普攻特效】人佛技能优化
|
2021-11-25 11:44:20 +08:00 |
gaoxin
|
e1d36c413f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 11:20:06 +08:00 |
gaoxin
|
53648fbbe3
|
【每日豪礼】预设文字替换
|
2021-11-25 11:20:00 +08:00 |
ZhangBiao
|
3ffefeea3c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 11:03:17 +08:00 |
ZhangBiao
|
855f658a93
|
【灵兽宝阁】错误修改
|
2021-11-25 11:03:08 +08:00 |
gaoxin
|
347cc3f9ba
|
【每日豪礼】资源68->98
|
2021-11-25 10:47:02 +08:00 |
ZhangBiao
|
0d3f9c36ad
|
【灵脉秘境】背景图
|
2021-11-24 18:43:59 +08:00 |
ZhangBiao
|
e4b0fd1824
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 18:14:37 +08:00 |
ZhangBiao
|
ac768ff163
|
【常驻活动】提交
|
2021-11-24 18:14:25 +08:00 |
gaoxin
|
4607bd2fed
|
Merge branch '0功能/账号id校验' into china/dev
|
2021-11-24 16:03:34 +08:00 |
gaoxin
|
bb15f0056e
|
【战斗】弹道特效不在根据贝塞尔曲线运动
|
2021-11-24 14:42:11 +08:00 |
gaoxin
|
0ea258d1e8
|
【资源】各阵营普攻特效优化
|
2021-11-24 14:42:05 +08:00 |
gaoxin
|
36f017fbaa
|
【新普攻特效】显示优化
|
2021-11-24 14:41:59 +08:00 |
wangzhenxing
|
338312dbd7
|
【战斗】=======4阵营普通攻击新特效上传
|
2021-11-24 14:41:44 +08:00 |
gaoxin
|
a97cc47cce
|
Merge branch 'china/dev' into china/dev_res
|
2021-11-24 14:30:07 +08:00 |
gaoxin
|
d8a80ba53b
|
【战斗】弹道特效不在根据贝塞尔曲线运动
|
2021-11-24 14:29:47 +08:00 |
gaoxin
|
fd29507df3
|
【资源】各阵营普攻特效优化
|
2021-11-24 14:28:30 +08:00 |
gaoxin
|
d1ce54c9a9
|
【测试战斗】报错修复
|
2021-11-24 14:22:27 +08:00 |
gaoxin
|
f01889db21
|
【战斗】改为第三回合时战斗就可以跳过
|
2021-11-24 14:21:44 +08:00 |
gaoxin
|
86dff44ce7
|
【主界面按钮】兼容删除了的活动
|
2021-11-24 11:43:46 +08:00 |
ZhangBiao
|
2d25ebb61b
|
【修为】修为调整
|
2021-11-24 11:30:55 +08:00 |
zhangshanxue
|
390f5103ca
|
Merge branch 'china/test' of http://60.1.1.230/gaoxin/JL_Client into china/test
|
2021-11-24 11:07:31 +08:00 |
ZhangBiao
|
eb6f41e03b
|
【云游商人】装备文字叠加、显示人名错误修改
|
2021-11-24 11:07:23 +08:00 |
ZhangBiao
|
0e15c3d812
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 10:22:51 +08:00 |
ZhangBiao
|
18648a7622
|
【云游商人】装备文字叠加、显示人名错误修改
|
2021-11-24 10:18:36 +08:00 |
jiaoyangna
|
62ce4ba105
|
排行奖励切换奖励显示不正确修改
(cherry picked from commit e947ab68b2 )
|
2021-11-24 07:44:24 +08:00 |
jiaoyangna
|
012847047e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 07:28:50 +08:00 |
jiaoyangna
|
e947ab68b2
|
排行奖励切换奖励显示不正确修改
|
2021-11-24 07:24:17 +08:00 |
gaoxin
|
5462a1ad3b
|
【战斗】弹道特效转向
|
2021-11-23 17:23:35 +08:00 |
gaoxin
|
3f343bb1b2
|
【战斗】关卡和每日副本战斗改为3回合后跳过,其他战斗直接可以跳过
|
2021-11-23 17:22:54 +08:00 |
gaoxin
|
6c3c4a0a70
|
【新普攻特效】显示优化
|
2021-11-23 15:28:49 +08:00 |
zhangshanxue
|
96a4af1532
|
Merge branch 'china/dev' into china/test
|
2021-11-23 15:27:31 +08:00 |
wangzhenxing
|
9cce1aa31c
|
【战斗表现】======剧情特殊处理敌人名字位置
|
2021-11-23 15:13:43 +08:00 |
zhangshanxue
|
f843b81623
|
Merge branch 'china/dev' into china/test
|
2021-11-23 14:59:16 +08:00 |
jiaoyangna
|
86bf793ba7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-23 14:01:00 +08:00 |
jiaoyangna
|
735b2dc404
|
法宝之灵展示修改
|
2021-11-23 14:00:36 +08:00 |
gaoxin
|
13ed0776b6
|
Merge branch 'china/dev' into china/dev_res
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
# Assets/ManagedResources/Spine/c_0023_02/c_0023_02.png.meta
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
|
2021-11-23 11:35:33 +08:00 |
zhangshanxue
|
c5a0ff4bca
|
Merge branch 'china/dev' into china/test
|
2021-11-23 11:24:45 +08:00 |
wangzhenxing
|
ebc519eaa1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-23 10:47:25 +08:00 |
wangzhenxing
|
b8b1c74f03
|
[战斗]========被动391修改 我方流血显示修改
|
2021-11-23 10:46:52 +08:00 |
ZhangBiao
|
60c12192af
|
【灵脉秘境】记录时间文字不显示修改
|
2021-11-23 10:43:38 +08:00 |
jiaoyangna
|
e88f1f7b01
|
【ID1019276】
【法宝聚灵】改排版后,返回按钮遮挡技能描述
|
2021-11-23 10:31:09 +08:00 |
ZhangBiao
|
6cd26e96af
|
【灵脉秘境】纪录换行问题修改
|
2021-11-22 19:11:07 +08:00 |
ZhangBiao
|
fbb58dbfdc
|
【云游商人】不同神将穿戴同一品质装备,弹窗显示的都是一个神将名
|
2021-11-22 18:44:32 +08:00 |
ZhangBiao
|
bdc85fea41
|
【灵脉秘境】红点修改
|
2021-11-22 18:08:48 +08:00 |
zhangshanxue
|
109d4cd216
|
Merge branch 'china/dev' into china/test
|
2021-11-22 18:03:28 +08:00 |
ZhangBiao
|
ba1201dd7a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 17:59:55 +08:00 |