jiaoyangna
|
25f3f927d6
|
位置修改提交
|
2021-10-12 17:51:04 +08:00 |
ZhangBiao
|
9604225256
|
【御剑行】可以完成循环_提交
|
2021-10-12 17:21:46 +08:00 |
jiaoyangna
|
134e52feeb
|
赠予抖动修改提交
|
2021-10-12 17:17:16 +08:00 |
jiaoyangna
|
0740005166
|
好感度位置修改提交
|
2021-10-12 17:09:58 +08:00 |
wangzhenxing
|
7a83198c6f
|
播放战斗对碰时添加按钮屏蔽
|
2021-10-12 16:39:58 +08:00 |
jiaoyangna
|
3f92309d78
|
好感度添加特效
|
2021-10-12 16:33:10 +08:00 |
wangzhenxing
|
89216b64a5
|
玉虚队伍战斗显示不一致修改
|
2021-10-12 16:13:19 +08:00 |
ZhangBiao
|
533bd25780
|
【御剑行】提交
|
2021-10-12 15:53:57 +08:00 |
jiaoyangna
|
262aa7a7e7
|
装备界面适配修改提交
(cherry picked from commit 45d29ef264)
(cherry picked from commit edfe797ddd)
|
2021-10-12 15:51:32 +08:00 |
wangzhenxing
|
c4d7edc289
|
玉虚bug修改
|
2021-10-12 15:33:39 +08:00 |
jiaoyangna
|
60b53f2d7b
|
神将详情,装备修改提交
|
2021-10-12 15:32:07 +08:00 |
jiaoyangna
|
e70329e605
|
神将详情显示错误修改
|
2021-10-12 14:54:12 +08:00 |
jiaoyangna
|
e7cfacdccd
|
神奖详情界面修改提交
|
2021-10-12 14:26:19 +08:00 |
jiaoyangna
|
79e751197f
|
战力不一致修改提交
|
2021-10-12 13:20:24 +08:00 |
jiaoyangna
|
b0f9b28036
|
神将详情报错修改提交
|
2021-10-12 12:17:33 +08:00 |
jiaoyangna
|
1a165839fd
|
点击神将详情界面查看属性按钮报错修改必现
|
2021-10-12 12:16:31 +08:00 |
wangzhenxing
|
1b2c8cc693
|
回方添加战斗力显示,解决青铜1升青铜2 进度条时间太长问题
|
2021-10-12 11:51:43 +08:00 |
ZhangBiao
|
359ca6b299
|
【御剑行】提交
|
2021-10-12 11:26:48 +08:00 |
wangzhenxing
|
4317d1df54
|
奖励显示修改
|
2021-10-12 10:27:49 +08:00 |
jiaoyangna
|
fb0aec52e6
|
好感度优化
|
2021-10-12 10:05:10 +08:00 |
wangzhenxing
|
2f31f6c588
|
上阵界面排序修改
|
2021-10-12 10:03:20 +08:00 |
wangzhenxing
|
d2c2b39b8b
|
[战斗]==========被动312修改
|
2021-10-11 17:46:01 +08:00 |
ZhangBiao
|
99d80454f5
|
【御剑行】增加开始动画
|
2021-10-11 17:25:48 +08:00 |
wangzhenxing
|
d8a0a0e8c1
|
玉虚提交
|
2021-10-11 16:30:33 +08:00 |
jiaoyangna
|
457b40b1e2
|
点击报错修改
|
2021-10-11 15:25:55 +08:00 |
jiaoyangna
|
4a338b9d4c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-11 15:15:50 +08:00 |
jiaoyangna
|
750f4afaef
|
ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 15:15:34 +08:00 |
ZhangBiao
|
853933b0ea
|
【优化】服务器列表排序
|
2021-10-11 15:01:49 +08:00 |
ZhangBiao
|
294147b9ba
|
【御剑行】提交
|
2021-10-11 14:37:33 +08:00 |
jiaoyangna
|
4ff2e1dc8d
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 13:53:02 +08:00 |
jiaoyangna
|
d9dce4e4ca
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 12:45:23 +08:00 |
jiaoyangna
|
5f15c8549e
|
【ID1010432】
【四灵试炼】编队界面的神将排序改为与心魔试炼相同
|
2021-10-11 11:33:55 +08:00 |
jiaoyangna
|
1269b5b114
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 11:31:03 +08:00 |
wangzhenxing
|
453216c6c7
|
【战斗】==========被动344修改
|
2021-10-09 18:23:45 +08:00 |
ZhangBiao
|
a0911448b2
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-09 18:18:32 +08:00 |
ZhangBiao
|
110a6d64c0
|
【御剑行】导入资源,剑
|
2021-10-09 18:17:59 +08:00 |
wangzhenxing
|
79addd132d
|
[战斗]=========被动250 修改
|
2021-10-09 18:10:11 +08:00 |
wangzhenxing
|
4bd1047ccc
|
[战斗]=====被动116 258 281 312 344修改
|
2021-10-09 17:13:24 +08:00 |
ZhangBiao
|
895916a53a
|
【御剑行】提交
|
2021-10-09 16:24:34 +08:00 |
jiaoyangna
|
ad690ffc38
|
去掉次数修改
|
2021-10-09 15:26:33 +08:00 |
jiaoyangna
|
f4997e7a57
|
【ID1018706】
【巅峰赛】准备阶段一键上阵可以换人
|
2021-10-09 15:22:42 +08:00 |
jiaoyangna
|
4b7838584b
|
红点修改提交
|
2021-10-09 15:04:43 +08:00 |
jiaoyangna
|
89f66bc294
|
特权收益描述修改提交
|
2021-10-09 14:53:22 +08:00 |
jiaoyangna
|
e3bb67c8a1
|
特权收益显示修改提交
|
2021-10-09 14:34:34 +08:00 |
ZhangBiao
|
f1e5f69614
|
【御剑行】提交
|
2021-10-09 14:33:09 +08:00 |
jiaoyangna
|
7737449829
|
【ID1018681】
【好感度】逍遥游游历成功界面的礼物图标点不开
|
2021-10-09 12:14:34 +08:00 |
jiaoyangna
|
d58e38fcea
|
【ID1018684】
【好感度】好感度挂机加成没在挂机奖励预览处显示数量
|
2021-10-09 12:04:01 +08:00 |
jiaoyangna
|
32a38b6053
|
【ID1018679】
【好感度】礼物图标在背包没阵营标记
|
2021-10-09 11:39:09 +08:00 |
ZhangBiao
|
5d4dc1ab37
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-09 11:15:04 +08:00 |
ZhangBiao
|
e8bfd73a9d
|
【织女】立绘不动修改
|
2021-10-09 11:14:24 +08:00 |
jiaoyangna
|
e23d1259f1
|
ID1018689】
【好感度】好感度详情界面,好感等级进度,已达成的固定显示好感度
|
2021-10-09 11:09:53 +08:00 |
jiaoyangna
|
8b13f803c8
|
ID1018691】
【好感度】背包里所有5星好感度都满了,好感度入口还显示红点
|
2021-10-09 11:06:59 +08:00 |
ZhangBiao
|
f2b5f62ddd
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-10-09 11:00:18 +08:00 |
ZhangBiao
|
09bb4fc688
|
【御剑行】可以读取剧本移动了
|
2021-10-09 10:56:49 +08:00 |
jiaoyangna
|
845373e12d
|
好感度长按修改提交
|
2021-10-09 10:53:32 +08:00 |
ZhangBiao
|
21bdecb465
|
【御剑行】提交
|
2021-10-08 20:49:25 +08:00 |
jiaoyangna
|
c72d3af853
|
【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
|
2021-10-08 19:32:16 +08:00 |
jiaoyangna
|
937096d445
|
【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
|
2021-10-08 19:17:59 +08:00 |
jiaoyangna
|
7b88415339
|
好感度优化提交
|
2021-10-08 18:53:06 +08:00 |
ZhangBiao
|
81a3db0446
|
【御剑行】提交
|
2021-10-08 15:45:28 +08:00 |
jiaoyangna
|
6700723aaa
|
好感度0级挂机收益显示错误修改
|
2021-10-08 14:31:28 +08:00 |
jiaoyangna
|
14008964fc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-08 11:55:25 +08:00 |
jiaoyangna
|
f449016952
|
添加容错
|
2021-10-08 11:55:01 +08:00 |
ZhangBiao
|
878f0410ee
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-08 11:54:09 +08:00 |
ZhangBiao
|
eb816dcc89
|
【七界试炼】修复无法取消激活
|
2021-10-08 11:53:54 +08:00 |
jiaoyangna
|
e019ef8f22
|
【ID1010392】
点石成金基础收益随着玩家等级提升
|
2021-10-08 11:51:37 +08:00 |
jiaoyangna
|
8de35750c6
|
【ID1010413】
【新功能】玩家等级提升时 发放道具进背包
|
2021-10-08 11:34:48 +08:00 |
gaoxin
|
2dbb544a46
|
【登录】登录接口编号增加
|
2021-09-30 15:19:10 +08:00 |
wangzhenxing
|
36d542ba9d
|
玉虚论道优化提交
|
2021-09-30 15:12:02 +08:00 |
gaoxin
|
2eb04261bc
|
Merge branch '0优化/装备对比' into china/dev
|
2021-09-30 15:01:40 +08:00 |
gaoxin
|
4d907f1530
|
【装备界面优化】移除替换装备和宝物时上方的当前装备/宝物信息
|
2021-09-30 15:01:19 +08:00 |
jiaoyangna
|
6ebea4784d
|
好感度报错修改
|
2021-09-30 11:37:24 +08:00 |
wangzhenxing
|
31e8594a70
|
[战斗]=========御甲添加 图片字提示表现
|
2021-09-30 09:53:31 +08:00 |
ZhangBiao
|
660a88b965
|
【御剑行】提交
|
2021-09-29 18:34:54 +08:00 |
jiaoyangna
|
b88bfef04f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-29 18:23:26 +08:00 |
jiaoyangna
|
b44c4af217
|
好感度0点次数刷新修改
|
2021-09-29 18:23:13 +08:00 |
gaoxin
|
73709000a9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-29 17:34:38 +08:00 |
gaoxin
|
971a457224
|
【战斗力】修复计算在编队上的人物临时数据时未计算编队相关属性的问题
|
2021-09-29 17:34:20 +08:00 |
jiaoyangna
|
8abe248a24
|
逍遥游奖励界面修改提交
|
2021-09-29 16:21:24 +08:00 |
jiaoyangna
|
4dfdc507f7
|
绿色修改提交
|
2021-09-29 16:19:29 +08:00 |
jiaoyangna
|
a62e656d7b
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
|
2021-09-29 15:49:39 +08:00 |
gaoxin
|
0abe5663c6
|
【战斗力】debug时不再计算老版本的战斗力
|
2021-09-29 14:55:14 +08:00 |
jiaoyangna
|
ee096187ad
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-29 14:35:15 +08:00 |
jiaoyangna
|
f2273e427c
|
逍遥游改表代码修改提交
|
2021-09-29 14:34:59 +08:00 |
gaoxin
|
2352144ead
|
【四灵试炼】助战神将报错
|
2021-09-29 09:19:53 +08:00 |
gaoxin
|
b1dff6a023
|
【四灵试炼】修复计算助战神将战斗力报错
|
2021-09-29 08:33:09 +08:00 |
gaoxin
|
8692e6cec9
|
【四灵试炼】修复计算助战神将战斗力报错
|
2021-09-29 08:32:40 +08:00 |
gaoxin
|
788d18e332
|
【装备对比】背包中的装备信息界面修改
|
2021-09-28 21:00:50 +08:00 |
gaoxin
|
e56affc4b4
|
【装备对比】装备穿戴界面显示修改
|
2021-09-28 19:45:21 +08:00 |
jiaoyangna
|
c242b86dd2
|
好感度详情提交
|
2021-09-28 18:23:37 +08:00 |
ZhangBiao
|
fa1c5a5dee
|
【御剑行】提交
|
2021-09-28 17:48:28 +08:00 |
jiaoyangna
|
b6a9cbc1c1
|
进度条修改提交
(cherry picked from commit 592845bf98)
|
2021-09-28 17:41:47 +08:00 |
wangzhenxing
|
81ace8ae2e
|
玉虚论道入口修改
|
2021-09-28 17:29:33 +08:00 |
jiaoyangna
|
d7dc0425cb
|
玲珑宝镜修改提交
|
2021-09-28 17:22:00 +08:00 |
wangzhenxing
|
d45abf6fcf
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-09-28 15:54:33 +08:00 |
wangzhenxing
|
ae3efee379
|
提交修改
|
2021-09-28 15:50:09 +08:00 |
jiaoyangna
|
26832c2350
|
去掉log
|
2021-09-28 13:43:23 +08:00 |
jiaoyangna
|
d9162dbbe3
|
选中框修改提交
|
2021-09-28 13:39:24 +08:00 |
wangzhenxing
|
f580f14a44
|
段位特效修改提交
|
2021-09-28 11:51:20 +08:00 |
jiaoyangna
|
5d9b93ca57
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-28 11:31:00 +08:00 |
jiaoyangna
|
46731f726f
|
玲珑宝镜修改提交
|
2021-09-28 11:30:44 +08:00 |
ZhangBiao
|
77eccdd8b7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-28 11:24:04 +08:00 |
ZhangBiao
|
8ec75376da
|
【限时召唤】报错修改
|
2021-09-28 11:23:50 +08:00 |
gaoxin
|
4d4e8cf55e
|
【副本战斗】战斗结算时报错
|
2021-09-28 11:20:42 +08:00 |
ZhangBiao
|
422806200e
|
【御剑行】提交
|
2021-09-28 10:34:05 +08:00 |
wangzhenxing
|
e42540ade8
|
排行榜修改提交
|
2021-09-28 10:29:33 +08:00 |
jiaoyangna
|
b0c02a7ff0
|
修改道具排序顺序
|
2021-09-28 10:12:12 +08:00 |
jiaoyangna
|
33acb35f82
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-09-28 09:52:22 +08:00 |
jiaoyangna
|
92294c6239
|
赠送之后立绘动作修改
|
2021-09-28 09:47:56 +08:00 |
jiaoyangna
|
e54fc2faa9
|
去掉左右切换按钮
|
2021-09-27 21:43:04 +08:00 |
jiaoyangna
|
ba7421ffa7
|
添加点击神将的互动
|
2021-09-27 21:39:43 +08:00 |
jiaoyangna
|
6de82cb731
|
好感度tips 提交
|
2021-09-27 21:35:55 +08:00 |
jiaoyangna
|
6e3dbffb64
|
报错修改
|
2021-09-27 20:33:45 +08:00 |
jiaoyangna
|
2e2a0d6edd
|
桃心位置修改
|
2021-09-27 20:26:45 +08:00 |
gaoxin
|
94782f7cf4
|
【ID1018635】 【唯一限制魂印】同时戴舍身济世和历战之躯,恭送掉该神将数据只会清一个,另一个依然是无法佩戴
|
2021-09-27 20:18:10 +08:00 |
jiaoyangna
|
75049d619c
|
好感度位置修改
|
2021-09-27 20:07:55 +08:00 |
jiaoyangna
|
af63daaeaf
|
好感度到达最大值修改
|
2021-09-27 19:20:29 +08:00 |
gaoxin
|
ed3f38f9cb
|
【战斗力】修复部分数据刷新不及时
|
2021-09-27 18:33:58 +08:00 |
ZhangBiao
|
a67e3226ce
|
【寻宝迷踪】走到指定地点,返回,再进入挖宝图标亮起
|
2021-09-27 17:52:24 +08:00 |
ZhangBiao
|
1fd9f8a004
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 17:46:53 +08:00 |
jiaoyangna
|
ad35e1646c
|
特权显示修改
|
2021-09-27 17:46:43 +08:00 |
ZhangBiao
|
a8c9c836a9
|
【排行榜】膜拜转圈儿修复
|
2021-09-27 17:46:40 +08:00 |
gaoxin
|
a2cd31dbd2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 17:35:48 +08:00 |
gaoxin
|
eacf753e55
|
【战斗力】修复部分设置人物属性全部为脏数据时没有设置战斗力脏数据
|
2021-09-27 17:35:36 +08:00 |
wangzhenxing
|
1a808dfd54
|
[战斗]============被动137修改 添加查找没有触发不灭的技能目标
|
2021-09-27 17:33:51 +08:00 |
jiaoyangna
|
ea52d01112
|
好感度新手引导修改提交
|
2021-09-27 17:26:35 +08:00 |
gaoxin
|
f929826eba
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 17:15:42 +08:00 |
gaoxin
|
07a96a88e4
|
【轩辕宝镜】修复只上阵了满足条件的神将,没有补位的问题
|
2021-09-27 17:13:48 +08:00 |
ZhangBiao
|
a4ee19a351
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 17:02:59 +08:00 |
ZhangBiao
|
5939c5b2f8
|
【七界试炼】跳转提交
|
2021-09-27 17:02:43 +08:00 |
gaoxin
|
c8c003abb7
|
【无尽副本】修复编队无法保存的问题
|
2021-09-27 16:58:08 +08:00 |
gaoxin
|
38f41e7517
|
【战斗】修复无尽副本战斗结束后报错
|
2021-09-27 16:57:40 +08:00 |
jiaoyangna
|
c778c334e5
|
添加道具属性显示
|
2021-09-27 16:49:25 +08:00 |
jiaoyangna
|
644d8e3790
|
长按短按效果添加
|
2021-09-27 16:43:01 +08:00 |
jiaoyangna
|
9276097bf4
|
神将不能拖动修改
|
2021-09-27 16:27:58 +08:00 |
wangzhenxing
|
70ebab2fe1
|
【功能】====装备合成添加特效
|
2021-09-27 16:25:20 +08:00 |
yuanshuai
|
f16bb7ed8e
|
【四象心法】长按强化bug修改
|
2021-09-27 15:57:36 +08:00 |
jiaoyangna
|
8aeb4f2416
|
添加逍遥游跳转
|
2021-09-27 15:50:25 +08:00 |
jiaoyangna
|
1d1e21a9e7
|
属性格式修改提交
|
2021-09-27 15:45:23 +08:00 |
gaoxin
|
0233ff87e7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 15:36:00 +08:00 |
gaoxin
|
34ade2489d
|
【无尽副本】修复报错
|
2021-09-27 15:35:48 +08:00 |
ZhangBiao
|
6bc25cd08c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 15:33:52 +08:00 |
ZhangBiao
|
e4250d3fac
|
【七界试炼】红点不再请求数据
|
2021-09-27 15:33:30 +08:00 |
gaoxin
|
6c50cdfd09
|
【无尽副本】修复无尽副本编队没有人得问题
|
2021-09-27 14:57:27 +08:00 |
ZhangBiao
|
810614f226
|
【四象心法】增加跳转
(cherry picked from commit 98d3911f23)
|
2021-09-27 14:37:20 +08:00 |
ZhangBiao
|
98d3911f23
|
【四象心法】增加跳转
|
2021-09-27 14:32:59 +08:00 |
jiaoyangna
|
9137d9f592
|
新手引导调整
|
2021-09-27 14:22:23 +08:00 |
wangzhenxing
|
433ae25590
|
[战斗]======被动351 353 修改
|
2021-09-27 13:47:27 +08:00 |
ZhangBiao
|
90d9530b2b
|
【乾坤宝盒】报错修改
|
2021-09-27 11:46:17 +08:00 |
jiaoyangna
|
fb2bcaff48
|
好感度增加返回提示
|
2021-09-27 11:22:17 +08:00 |
jiaoyangna
|
4e17b829ba
|
红点修改提交,挂机界面预览修改提交
|
2021-09-27 10:58:41 +08:00 |
jiaoyangna
|
d4e3a3294c
|
引导修改提交
|
2021-09-27 10:41:32 +08:00 |
ZhangBiao
|
cdd6499fe8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 10:34:19 +08:00 |
ZhangBiao
|
0842438fdf
|
【装备分解】不可分解白金装备and增加mask点击
|
2021-09-27 10:34:03 +08:00 |
jiaoyangna
|
683e71ae89
|
好感度入口调整
|
2021-09-27 09:45:57 +08:00 |
jiaoyangna
|
13428bc854
|
神将排序修改
|
2021-09-26 21:49:05 +08:00 |
jiaoyangna
|
a0778d0173
|
新手引导修改
|
2021-09-26 21:46:01 +08:00 |
jiaoyangna
|
3a5e3cf17e
|
好感度提交
|
2021-09-26 21:32:04 +08:00 |
gaoxin
|
ace42823db
|
【战斗】被动353,修复溢出的伤害无法被无敌盾抵消的问题
|
2021-09-26 20:48:32 +08:00 |
gaoxin
|
2bce8547c7
|
【战斗】被动353直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害
|
2021-09-26 20:31:51 +08:00 |
jiaoyangna
|
d39ef472dc
|
好感度提交
|
2021-09-26 20:23:08 +08:00 |
wangzhenxing
|
3ff3649284
|
【功能】======白金装备合成 最少显示信息修改
|
2021-09-26 20:03:14 +08:00 |
wangzhenxing
|
306ab999b9
|
[功能]=============白金装备合成红点修改
|
2021-09-26 19:47:18 +08:00 |
gaoxin
|
f282fe046b
|
【白金装备】修改白金装备字体显示
|
2021-09-26 18:41:47 +08:00 |
gaoxin
|
54afaef65a
|
【GM】一键顶级装备红色一星装备生成错误
|
2021-09-26 17:43:38 +08:00 |
gaoxin
|
e318ca197f
|
【GM】一键顶级装备,增加白金装备
|
2021-09-26 17:40:48 +08:00 |
ZhangBiao
|
a565d94658
|
【御剑行】资源提交
|
2021-09-26 17:39:49 +08:00 |
gaoxin
|
8310c29aaf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 17:38:39 +08:00 |
gaoxin
|
b21e7efe0d
|
【角色信息】修复跳转到角色信息界面,点击左右箭头报错
|
2021-09-26 17:38:23 +08:00 |
wangzhenxing
|
e763b6472b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 17:31:16 +08:00 |
wangzhenxing
|
a3e1782007
|
【功能】==========白金装备合成提交
|
2021-09-26 17:30:35 +08:00 |
gaoxin
|
e61dea0f4a
|
【白金装备】套装显示添加
|
2021-09-26 17:13:12 +08:00 |
jiaoyangna
|
d7276eae64
|
战力修改提交
|
2021-09-26 15:23:33 +08:00 |
gaoxin
|
e671673389
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 15:02:49 +08:00 |
gaoxin
|
59311a8d88
|
【跨服】算错了跨服前七天的事件
|
2021-09-26 15:02:33 +08:00 |
wangzhenxing
|
221939e1ec
|
[战斗]==========御甲条显示修改
|
2021-09-26 14:56:07 +08:00 |
jiaoyangna
|
330b36b55a
|
好感度等级修改
|
2021-09-26 14:21:22 +08:00 |
jiaoyangna
|
e59f160387
|
好感度等级修改提交
|
2021-09-26 13:55:57 +08:00 |
gaoxin
|
6a71a972e9
|
【战斗力】关闭一些log
|
2021-09-26 11:18:38 +08:00 |
jiaoyangna
|
14b967185b
|
好感度提交
|
2021-09-26 10:18:51 +08:00 |
ZhangBiao
|
59e51aefef
|
【七界试炼】提交
|
2021-09-26 10:08:15 +08:00 |
ZhangBiao
|
8f9743d127
|
【七界试炼】激活遗物提示,奖励遮盖
|
2021-09-26 10:01:37 +08:00 |
jiaoyangna
|
1152586ff1
|
好感度提交
|
2021-09-26 09:54:58 +08:00 |
ZhangBiao
|
bac86d5ec8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 19:23:43 +08:00 |
ZhangBiao
|
1a866b1068
|
【七界试炼】提交
|
2021-09-24 19:23:30 +08:00 |
gaoxin
|
8c76d476a2
|
【编队】修复保存编队接口名修改导致的报错
|
2021-09-24 17:49:32 +08:00 |
wangzhenxing
|
d83cf97ae2
|
【战斗】==========被动93 307 309 351修改
|
2021-09-24 17:40:08 +08:00 |
ZhangBiao
|
1505647241
|
【七界试炼】框位不齐
|
2021-09-24 17:02:38 +08:00 |
ZhangBiao
|
35091621dc
|
【七界试炼】提交
|
2021-09-24 16:52:05 +08:00 |
ZhangBiao
|
a823984187
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 16:47:19 +08:00 |
ZhangBiao
|
028f97c195
|
【七界试炼】红点和跳转i需改
|
2021-09-24 16:47:06 +08:00 |
yuanshuai
|
77a47432bf
|
【四象心法】强化按钮点击强化两次bug修改
|
2021-09-24 15:59:01 +08:00 |
yuanshuai
|
ad8f5ac73e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:45:50 +08:00 |
yuanshuai
|
7f94f9e185
|
思想心法bug修改
|
2021-09-24 15:45:20 +08:00 |
wangzhenxing
|
34f52e18e7
|
[战斗]=====被动352 描述修改
|
2021-09-24 15:20:59 +08:00 |
wangzhenxing
|
e8b7af1cf7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:14:29 +08:00 |
wangzhenxing
|
8ffd86ee19
|
Merge branch 'china/dev-c-battle' into china/dev
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-09-24 15:13:46 +08:00 |
ZhangBiao
|
ff9d22e14d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:12:42 +08:00 |
ZhangBiao
|
ce1a5f25ea
|
【七界试炼】奖励位置调整
|
2021-09-24 15:11:57 +08:00 |
wangzhenxing
|
19f7984f01
|
[战斗]=============新增352被动
|
2021-09-24 14:59:54 +08:00 |
ZhangBiao
|
c862eac46e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 14:57:14 +08:00 |
ZhangBiao
|
b0e24676b3
|
【七界试炼】增加秘宝入口开启处理
|
2021-09-24 14:57:04 +08:00 |
wangzhenxing
|
9abf1ef390
|
Merge branch 'china/dev-c-battle' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-09-24 14:56:13 +08:00 |
wangzhenxing
|
48cc9357c1
|
[战斗]==========被动194修改 新增被动251 额外行动修改
|
2021-09-24 14:46:02 +08:00 |
jiaoyangna
|
136d872fbd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 14:20:32 +08:00 |
jiaoyangna
|
003583db7b
|
无尽副本报错修改
|
2021-09-24 14:19:50 +08:00 |
ZhangBiao
|
9ff1957ff7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 14:06:26 +08:00 |
ZhangBiao
|
c9305b4247
|
【七界试炼】提交
|
2021-09-24 14:06:09 +08:00 |
wangzhenxing
|
5c174efcbd
|
排行榜修改
|
2021-09-24 11:09:09 +08:00 |
gaoxin
|
ddb97196d9
|
【首充】金额改为special表配置
|
2021-09-24 11:05:39 +08:00 |
ZhangBiao
|
35e6c617fb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 10:28:10 +08:00 |
ZhangBiao
|
8bd1896aba
|
【七界试炼】敌方英雄展示修改
|
2021-09-24 10:27:56 +08:00 |
gaoxin
|
2473fb149a
|
【ID1018513】【魂印分解】选择多个魂印分解时就算紫色也会提示选择了金色,单个魂印分解时就算白金也不提示
【ID1018512】【魂印分解】列表拖动到底部,点击筛选页签,不回弹
|
2021-09-24 10:17:25 +08:00 |
gaoxin
|
65efa9336c
|
【魂印】修复神将恭送后没有重置魂印的穿戴状态,导致力战之躯魂印无法穿戴的问题
|
2021-09-23 20:59:44 +08:00 |
ZhangBiao
|
a2d7bedb5b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 19:47:32 +08:00 |
ZhangBiao
|
d0c38ec9d7
|
【七界试炼】提交
|
2021-09-23 19:47:17 +08:00 |
wangzhenxing
|
212cc1f946
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-09-23 19:46:09 +08:00 |
gaoxin
|
65df3f1a37
|
【名字】添加名称正确性检测
|
2021-09-23 19:43:24 +08:00 |
gaoxin
|
c3820f13ae
|
【编队】修复无法复制编队的问题
|
2021-09-23 19:42:45 +08:00 |
ZhangBiao
|
6ced770ef1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 19:23:37 +08:00 |
ZhangBiao
|
5af10faa57
|
【七界试炼】提交
|
2021-09-23 19:23:27 +08:00 |
xuexinpeng
|
02f840ee83
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-23 18:04:24 +08:00 |
xuexinpeng
|
ff74924ea9
|
添加gm
|
2021-09-23 17:59:28 +08:00 |
gaoxin
|
0d76922c85
|
【编队】刷新编队时,保存编队的方法错误
|
2021-09-23 17:54:29 +08:00 |
jiaoyangna
|
ee5182dced
|
玲珑宝镜领取状态修改提交
|
2021-09-23 16:59:30 +08:00 |
jiaoyangna
|
fcae70ae04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:50:48 +08:00 |
jiaoyangna
|
80e2cab589
|
玲珑宝镜跳转修改提交
|
2021-09-23 16:50:24 +08:00 |
ZhangBiao
|
170d4886e3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:46:50 +08:00 |
ZhangBiao
|
93b3839727
|
【七界试炼】商店刷新事件
|
2021-09-23 16:46:35 +08:00 |
jiaoyangna
|
ec8d3631d9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:46:16 +08:00 |
jiaoyangna
|
5b7b607725
|
主城玲珑宝镜入口提交
|
2021-09-23 16:21:51 +08:00 |
gaoxin
|
515294f16b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:17:09 +08:00 |
gaoxin
|
0f534367c5
|
【战斗力】不再计算编队老战斗力
|
2021-09-23 16:16:57 +08:00 |
ZhangBiao
|
9b24649f36
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:08:13 +08:00 |
ZhangBiao
|
0422b5c738
|
【七界试炼】提交
|
2021-09-23 16:08:02 +08:00 |
gaoxin
|
ac88b50cae
|
【编队】修复打开四灵试炼编队报错
|
2021-09-23 16:05:18 +08:00 |
gaoxin
|
f6c336e52f
|
【战斗力】添加一些log
|
2021-09-23 15:52:19 +08:00 |
gaoxin
|
1e011b560a
|
【跨服】开服前七天无法进入跨服
|
2021-09-23 15:52:01 +08:00 |
gaoxin
|
e362321aa5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 14:54:28 +08:00 |
gaoxin
|
b32183f20a
|
【玩家数据】添加服务器开启时间字段
|
2021-09-23 14:54:12 +08:00 |
ZhangBiao
|
524521d526
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 14:51:15 +08:00 |
ZhangBiao
|
016f0159e5
|
【七界试炼】提交
|
2021-09-23 14:51:04 +08:00 |
jiaoyangna
|
ec18db0efb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 14:33:44 +08:00 |
jiaoyangna
|
fb82580b37
|
玲珑商市修改提交
|
2021-09-23 14:33:31 +08:00 |
ZhangBiao
|
fc03b71b84
|
【七界试炼】tijiao
|
2021-09-23 14:21:30 +08:00 |
ZhangBiao
|
524bd129bc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 14:13:53 +08:00 |
ZhangBiao
|
9bac3f850e
|
【七界试炼】提交
|
2021-09-23 14:13:34 +08:00 |
jiaoyangna
|
e1abfa42e5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 12:30:37 +08:00 |
jiaoyangna
|
0705837511
|
玲珑宝镜间隔修改提交
|
2021-09-23 12:30:22 +08:00 |
ZhangBiao
|
ad3ea41597
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 12:02:10 +08:00 |
ZhangBiao
|
5c11a67393
|
【七界试炼】修改提交
|
2021-09-23 12:01:58 +08:00 |
jiaoyangna
|
a1a3eda93c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 11:17:01 +08:00 |
jiaoyangna
|
09a71048c7
|
红点检测提交
|
2021-09-23 11:16:46 +08:00 |
wangzhenxing
|
cbb22260f3
|
Merge branch 'china/dev-c-battle' into china/dev
|
2021-09-23 11:02:19 +08:00 |
wangzhenxing
|
fbaca4e989
|
[战斗]====添加间接治疗得方法
|
2021-09-23 10:51:21 +08:00 |
jiaoyangna
|
6b6c6b48db
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 09:51:59 +08:00 |
jiaoyangna
|
d6002c5242
|
玲珑报镜十连修改提交
|
2021-09-23 09:51:45 +08:00 |
gaoxin
|
913d3c14a7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-22 20:54:52 +08:00 |
gaoxin
|
4f9cc3ee44
|
【奖励界面】部分界面胡乱显示经验调
|
2021-09-22 20:54:46 +08:00 |
jiaoyangna
|
a8eeec83f6
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
|
2021-09-22 20:53:08 +08:00 |
jiaoyangna
|
529094b6ad
|
好感度第一次提交
|
2021-09-22 20:47:13 +08:00 |
jiaoyangna
|
ca74a5c158
|
玲珑宝镜动画修改
|
2021-09-22 20:39:06 +08:00 |
jiaoyangna
|
7e5061844b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-22 20:23:45 +08:00 |
jiaoyangna
|
af3f2b8f32
|
添加玲珑商市跳转
|
2021-09-22 20:22:59 +08:00 |
yuanshuai
|
d8e88d4fba
|
【四象心法】点击消耗道具显示详情
|
2021-09-22 20:08:27 +08:00 |
jiaoyangna
|
4910773749
|
玲珑宝镜修改提交
|
2021-09-22 20:04:08 +08:00 |
jiaoyangna
|
0805ef4ebc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-22 20:02:01 +08:00 |
ZhangBiao
|
c29ad91a4c
|
【七界试炼】修改提交
|
2021-09-22 19:56:13 +08:00 |
ZhangBiao
|
32585cec01
|
【七界试炼】增加怪物详情界面
|
2021-09-22 19:38:16 +08:00 |
jiaoyangna
|
2f16f43379
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-22 18:02:32 +08:00 |
jiaoyangna
|
aeecd125e0
|
【ID1010383】
【优化】玲珑宝镜新增进度条奖励
|
2021-09-22 17:34:16 +08:00 |
ZhangBiao
|
042df03091
|
【七界试炼】零点不刷新修改
|
2021-09-22 16:45:23 +08:00 |
ZhangBiao
|
5f80bbb7a1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-22 16:26:04 +08:00 |
ZhangBiao
|
0b9055110d
|
【七界试炼】红点
|
2021-09-22 16:25:29 +08:00 |
yuanshuai
|
573cb8a8e3
|
误操作
|
2021-09-22 16:17:09 +08:00 |
gaoxin
|
579b566935
|
【四象心法】加入新的战斗力计算
|
2021-09-22 15:42:28 +08:00 |
gaoxin
|
34f3f42a04
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua
|
2021-09-22 15:36:10 +08:00 |
ZhangBiao
|
371c0fc080
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-09-22 15:21:59 +08:00 |
ZhangBiao
|
40fb962879
|
【七界试炼】合并后提交
|
2021-09-22 15:19:27 +08:00 |
yuanshuai
|
b145159311
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-22 15:13:12 +08:00 |
yuanshuai
|
db18313495
|
Merge branch '0功能/四象心法' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
# Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/ActivityProto.proto
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
# Assets/ManagedResources/~Lua/Message/ChatProto.proto
# Assets/ManagedResources/~Lua/Message/CommonProto.proto
# Assets/ManagedResources/~Lua/Message/Family.proto
# Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
# Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-09-22 15:12:32 +08:00 |
gaoxin
|
fa85ecb870
|
Revert "Revert "【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题""
This reverts commit 0e86945c53.
|
2021-09-22 14:59:34 +08:00 |
ZhangBiao
|
cea14746f8
|
【七界试炼】提交
|
2021-09-22 13:33:48 +08:00 |
ZhangBiao
|
1c191a78b9
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
|
2021-09-22 11:46:24 +08:00 |
gaoxin
|
bc659b68f8
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/Editor/AutoPack.cs
# Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs
|
2021-09-22 10:54:15 +08:00 |
gaoxin
|
e5af89fac9
|
Merge branch 'china/dev' into 0功能/玉虚论道
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
|
2021-09-22 10:37:42 +08:00 |
jiaoyangna
|
488753ab83
|
四灵编队修改提交
(cherry picked from commit 191603b77f)
|
2021-09-18 19:19:30 +08:00 |
jiaoyangna
|
71b380cdd2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-18 18:55:21 +08:00 |
jiaoyangna
|
4e5ef30243
|
在线四灵编队修改提交
|
2021-09-18 18:55:07 +08:00 |
gaoxin
|
2ca77d75ef
|
【易经宝库】修服选中大奖后次数显示异常
|
2021-09-18 18:40:21 +08:00 |
jiaoyangna
|
a628176640
|
四灵 修改提交
(cherry picked from commit 675cda9b4d)
|
2021-09-18 18:26:21 +08:00 |
ZhangBiao
|
47485caeda
|
【七界试炼】无免费次数按钮逻辑修改
|
2021-09-18 18:23:48 +08:00 |
jiaoyangna
|
4a494fac11
|
在线刷新一下编队
|
2021-09-18 18:19:45 +08:00 |
ZhangBiao
|
1ddc89ad54
|
【七界试炼】提交
|
2021-09-18 18:18:22 +08:00 |
jiaoyangna
|
3f24f4cd86
|
四灵试炼 修改提交
|
2021-09-18 17:58:28 +08:00 |
jiaoyangna
|
02f1888f3f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-18 17:07:42 +08:00 |
jiaoyangna
|
13e0865cc2
|
四灵助战报错修改
|
2021-09-18 17:07:01 +08:00 |
ZhangBiao
|
634f78d3c5
|
【七界试炼】提交
|
2021-09-18 16:52:06 +08:00 |
gaoxin
|
e3f4808936
|
【易经宝库】选择奖励界面显示错误
|
2021-09-18 16:32:52 +08:00 |
ZhangBiao
|
20ed8d5928
|
【七界试炼】密保名称
|
2021-09-18 16:14:46 +08:00 |
gaoxin
|
a3ff527bc9
|
【易经宝库】选择奖励界面,选中奖励后的显示效果优化
|
2021-09-18 16:14:03 +08:00 |
gaoxin
|
50f2a73898
|
【寻宝迷踪】修复界面刷新不及时的问题
|
2021-09-18 15:53:13 +08:00 |
yuanshuai
|
6b2eaf6cca
|
【四象心法】bug修改
|
2021-09-18 15:43:32 +08:00 |
gaoxin
|
7e954b997a
|
【易经宝库】修复查看剩余奖励报错
|
2021-09-18 15:15:22 +08:00 |
ZhangBiao
|
35e0c96748
|
【七界试炼】提交
|
2021-09-18 15:04:32 +08:00 |
gaoxin
|
39b7267239
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-18 14:19:31 +08:00 |
gaoxin
|
a80d16fbda
|
【易经宝库】修改选择奖励界面的排序规则
|
2021-09-18 14:19:26 +08:00 |
jiaoyangna
|
2bfe122214
|
易经宝库选择报错修改提交
(cherry picked from commit 8ae7a3174f)
(cherry picked from commit 20ccbed3c9)
|
2021-09-18 13:43:36 +08:00 |
wangzhenxing
|
a7f0c42cae
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-18 11:52:01 +08:00 |
ZhangBiao
|
b1265379f9
|
【七界试炼】排行榜和开启时间显示
|
2021-09-18 11:24:11 +08:00 |
ZhangBiao
|
49cb8272bc
|
Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-18 11:04:17 +08:00 |
ZhangBiao
|
74cdc4374f
|
【惊喜礼盒】礼包顺序调整
|
2021-09-18 11:03:54 +08:00 |
jiaoyangna
|
ac319513dc
|
【ID1018514】
【四灵试炼】线上号,打开战斗编队报错
|
2021-09-18 11:02:32 +08:00 |
gaoxin
|
0e86945c53
|
Revert "【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题"
This reverts commit cb4c81b420.
|
2021-09-18 10:56:55 +08:00 |
gaoxin
|
9da6a42947
|
【惊喜礼盒】修复活动结束,继续购买卡死
|
2021-09-18 10:56:35 +08:00 |
gaoxin
|
aa6bb5d606
|
【易经宝库】修复数据表BasicPoolId列无法读取,将数据格式改为字符串
|
2021-09-18 10:45:31 +08:00 |
ZhangBiao
|
45e24095f6
|
Revert "【寻宝迷踪】log增加"
This reverts commit e548fa6591.
|
2021-09-18 10:40:54 +08:00 |
wangzhenxing
|
e71f3b5d39
|
玉虚商店修改
|
2021-09-18 10:38:57 +08:00 |
ZhangBiao
|
e548fa6591
|
【寻宝迷踪】log增加
|
2021-09-18 10:38:18 +08:00 |
ZhangBiao
|
1910d54272
|
【七界试炼】提交
|
2021-09-18 10:29:30 +08:00 |
gaoxin
|
abe720d43d
|
【限时召唤】修复奖励界面报错
|
2021-09-17 20:04:53 +08:00 |
ZhangBiao
|
8307fbe7e1
|
【七界试炼】完成!!!
|
2021-09-17 19:57:45 +08:00 |
ZhangBiao
|
949d159010
|
【七界试炼】提交
|
2021-09-17 19:29:58 +08:00 |
ZhangBiao
|
488ad1caad
|
【七界试炼】七界秘宝提交
|
2021-09-17 17:42:18 +08:00 |
wangzhenxing
|
d5ce7b7f84
|
【战斗】=======被动37修改
|
2021-09-17 17:07:57 +08:00 |
gaoxin
|
cb4c81b420
|
【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题
|
2021-09-17 17:01:14 +08:00 |
gaoxin
|
472409a1b3
|
【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题
|
2021-09-17 17:00:59 +08:00 |
wangzhenxing
|
01e446fed3
|
[战斗]======免疫buff添加类型 5 免疫控制不免疫禁疗
|
2021-09-17 16:55:49 +08:00 |
ZhangBiao
|
163950a4a1
|
【七界试炼】提交
|
2021-09-17 16:29:21 +08:00 |
gaoxin
|
feae377b4f
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-17 15:25:56 +08:00 |
gaoxin
|
e3f11c86ed
|
【战斗力】界面展示优化
|
2021-09-17 15:24:10 +08:00 |
wangzhenxing
|
df1409717d
|
【战斗】==============技能是否可以释放处 添加目标数量判断,如果没有目标则不能释放
|
2021-09-17 15:20:44 +08:00 |
yuanshuai
|
b0c69c81a8
|
【四象心法】技能加成bug修改
|
2021-09-17 15:18:50 +08:00 |
gaoxin
|
247d9a85d0
|
【战斗力】删除无用的属性计算
|
2021-09-17 15:10:06 +08:00 |
gaoxin
|
5f11f26c4d
|
【红点】报错优化
|
2021-09-17 15:09:10 +08:00 |
gaoxin
|
a7ce05450b
|
【战斗力】 功能属性加入战斗力初始化
|
2021-09-17 15:08:37 +08:00 |
jiaoyangna
|
a793dccf22
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-17 14:47:50 +08:00 |
jiaoyangna
|
32ba399115
|
【ID1018484】
【森罗幻境】抽到整只灵兽,需要重登才会显示在背包
|
2021-09-17 14:47:20 +08:00 |
ZhangBiao
|
2925de34e8
|
【七界试炼】结算界面提交
|
2021-09-17 14:38:05 +08:00 |
wangzhenxing
|
52221aca04
|
【战斗】==========被动196 修改
|
2021-09-17 14:26:30 +08:00 |
ZhangBiao
|
ad4c218f01
|
【七界试炼】提交
|
2021-09-17 13:42:27 +08:00 |
wangzhenxing
|
4511eec383
|
【战斗】==========被动196 修改
|
2021-09-17 11:55:18 +08:00 |
gaoxin
|
38fcf555dd
|
【山河社稷图】修复战斗不一致
|
2021-09-16 22:43:38 +08:00 |
ZhangBiao
|
4d8576d200
|
【七界试炼】战斗层数锁住了
|
2021-09-16 21:05:43 +08:00 |
wangzhenxing
|
e584db1eaa
|
[战斗]===========被动196 200 188修改
|
2021-09-16 20:31:12 +08:00 |
ZhangBiao
|
60c954bf38
|
【七界试炼】提交
|
2021-09-16 19:36:16 +08:00 |
ZhangBiao
|
7e97b7c90b
|
【通用大弹窗】修改
|
2021-09-16 18:11:33 +08:00 |
wangzhenxing
|
28d68a2d43
|
玉虚论道修改
|
2021-09-16 18:10:51 +08:00 |
ZhangBiao
|
6c17058b8e
|
【寻宝迷踪】活动结束跳回还弹出奖励修改
|
2021-09-16 17:45:14 +08:00 |
ZhangBiao
|
9d8fa02bcc
|
【寻宝迷踪】提交
|
2021-09-16 17:33:23 +08:00 |
jiaoyangna
|
3d948e7f0c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 17:29:40 +08:00 |
jiaoyangna
|
da21b0ba37
|
修改提交
|
2021-09-16 17:29:16 +08:00 |
wangzhenxing
|
3b42d8034d
|
[战斗]==============技能实例里 技能是否能释放添加判断 如果没有攻击目标就返回 false
|
2021-09-16 17:27:16 +08:00 |
jiaoyangna
|
6c5552524b
|
报错修改
(cherry picked from commit 80e81f9f9b)
|
2021-09-16 17:16:25 +08:00 |
jiaoyangna
|
80e81f9f9b
|
报错修改
|
2021-09-16 17:15:30 +08:00 |
jiaoyangna
|
b4a2cdb018
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 17:11:50 +08:00 |
jiaoyangna
|
8293c56b37
|
建木神树图片修改提交
(cherry picked from commit f127a0e858)
|
2021-09-16 17:11:29 +08:00 |
jiaoyangna
|
f127a0e858
|
建木神树图片修改提交
|
2021-09-16 17:10:39 +08:00 |
ZhangBiao
|
1809ae7890
|
【魂灵宝】回收界面排序
|
2021-09-16 17:05:27 +08:00 |
ZhangBiao
|
20c122e096
|
【寻宝迷踪】红点修改
|
2021-09-16 16:52:22 +08:00 |
ZhangBiao
|
90a9abba0d
|
【寻宝迷踪】提价
|
2021-09-16 16:41:23 +08:00 |
ZhangBiao
|
a79d425b3b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 16:16:59 +08:00 |
ZhangBiao
|
1e17301cc8
|
【背包优化】宝物背包按照品质优先级进行排序,并增加阵营筛选功能
|
2021-09-16 16:16:50 +08:00 |
jiaoyangna
|
4e4a53d447
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-16 14:08:41 +08:00 |
jiaoyangna
|
415eb7a947
|
【寻宝迷踪】寻宝返回后默认返回显示活动第一个页签
|
2021-09-16 14:06:37 +08:00 |
ZhangBiao
|
537af282e6
|
【寻宝迷踪】提交
|
2021-09-16 14:05:07 +08:00 |
ZhangBiao
|
95adcb6b1d
|
Revert "【寻宝迷踪】修改提交"
This reverts commit 31304cc252.
|
2021-09-16 13:39:23 +08:00 |
gaoxin
|
2494b16f89
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-16 13:37:16 +08:00 |
gaoxin
|
66efc9d4e3
|
【战斗力】新战斗力计算系统完成
|
2021-09-16 13:35:33 +08:00 |
ZhangBiao
|
31304cc252
|
【寻宝迷踪】修改提交
|
2021-09-16 13:25:15 +08:00 |
ZhangBiao
|
512a12cc72
|
【七界试炼】提交
|
2021-09-16 11:24:35 +08:00 |
ZhangBiao
|
45de3d5c99
|
【七界试炼】提交
|
2021-09-15 18:09:21 +08:00 |
gaoxin
|
7462f02cfd
|
Revert Revert 回滚错误的合并 4f19f12612
|
2021-09-15 14:29:14 +08:00 |
ZhangBiao
|
ad9bcaa2fa
|
【七界试炼】提交
|
2021-09-15 14:02:39 +08:00 |
wangzhenxing
|
4ee0741896
|
[战斗]==============被动338修改 护甲逻辑修改
|
2021-09-15 11:23:04 +08:00 |
gaoxin
|
b26cbe30ae
|
【奖励界面】修复部分奖励界面显示异常的问题
|
2021-09-15 10:24:57 +08:00 |
gaoxin
|
3622d49888
|
【奖励界面】修复部分奖励界面显示异常的问题
|
2021-09-15 10:17:02 +08:00 |
wangzhenxing
|
08ecd82227
|
【战斗】==============被动346 347 348 349 350 提交
|
2021-09-14 19:58:01 +08:00 |
ZhangBiao
|
599fe0dcee
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
|
2021-09-14 17:54:18 +08:00 |
gaoxin
|
ec14782e3f
|
【红点】没删干净
|
2021-09-14 17:40:37 +08:00 |
gaoxin
|
fcc1e17cad
|
【红点】无用红点绑定事件删除
|
2021-09-14 17:37:44 +08:00 |
ZhangBiao
|
120be3af6f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-14 17:32:20 +08:00 |
ZhangBiao
|
fa5446d6d2
|
【鸿蒙阵】跨天英雄等级为0修复
|
2021-09-14 17:32:06 +08:00 |
gaoxin
|
12562b2ae2
|
【锻器阁】修复宝物详细打开两次显示异常
|
2021-09-14 16:56:33 +08:00 |
jiaoyangna
|
d9c2f3451b
|
好感度第一次提交
|
2021-09-14 14:45:22 +08:00 |
yuanshuai
|
a54cd46bc4
|
【四象心法】添加技能属性加成脚本
|
2021-09-14 11:37:34 +08:00 |
wangzhenxing
|
dbf05190bc
|
Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua
|
2021-09-14 10:32:25 +08:00 |
wangzhenxing
|
d056a2dd70
|
玉虚论道提交
|
2021-09-14 10:10:57 +08:00 |
wangzhenxing
|
982e0c5268
|
【战斗】=======被动56修改
|
2021-09-13 20:17:37 +08:00 |
wangzhenxing
|
b468cb6164
|
[战斗]============被动56修改 boss免疫额外生命百分比伤害
|
2021-09-13 19:43:13 +08:00 |
yuanshuai
|
f0da745b6c
|
bug修改
|
2021-09-13 19:00:53 +08:00 |
jiaoyangna
|
8d59f41e34
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-13 18:46:53 +08:00 |
jiaoyangna
|
828538d28a
|
精炼等级描述修改提交
|
2021-09-13 18:46:41 +08:00 |
yuanshuai
|
47cb5811cc
|
Merge branch 'china/dev' into 0功能/四象心法
|
2021-09-13 18:43:00 +08:00 |
yuanshuai
|
4aa823fb3c
|
【四象心法】bug修改
|
2021-09-13 18:40:38 +08:00 |
ZhangBiao
|
6bbb40171e
|
【十绝阵】点击一次挑战,挑战两次,尝试修改
|
2021-09-13 18:37:44 +08:00 |
ZhangBiao
|
20dc2526d6
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
|
2021-09-13 18:09:27 +08:00 |
ZhangBiao
|
b609616b6b
|
【七界试炼】提交
|
2021-09-13 18:06:39 +08:00 |
jiaoyangna
|
cb6c480956
|
宝物强化界面消耗本体去掉加号
|
2021-09-13 17:30:01 +08:00 |
yuanshuai
|
b25468cd26
|
四象心法bug 修改
|
2021-09-13 17:18:32 +08:00 |
jiaoyangna
|
d55dd4c59d
|
共鸣宝物报错强化修改提交
|
2021-09-13 16:17:38 +08:00 |
wangzhenxing
|
b3eb686222
|
bug修改提交
|
2021-09-13 14:11:48 +08:00 |
jiaoyangna
|
7cff74a295
|
无尽秘宝激活错误修改提交
|
2021-09-13 14:11:02 +08:00 |
ZhangBiao
|
94ed6ad618
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-13 13:56:43 +08:00 |
ZhangBiao
|
c68496654f
|
【七界试炼】遗物
|
2021-09-13 13:54:58 +08:00 |
ZhangBiao
|
8c9f31f028
|
【七界试炼】遗物
|
2021-09-13 11:42:14 +08:00 |
wangzhenxing
|
441e5ba1cc
|
aaaaa
|
2021-09-13 10:06:50 +08:00 |
gaoxin
|
6a3d4b99f7
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-11 20:26:49 +08:00 |
gaoxin
|
8e55ed2fff
|
【玉虚】角色信息界面大小动态变化
|
2021-09-11 20:26:43 +08:00 |
wangzhenxing
|
aaa4b987eb
|
玉虚论道修改
|
2021-09-11 19:47:23 +08:00 |
wangzhenxing
|
683b48fb0c
|
玉虚论道提交
|
2021-09-11 18:53:58 +08:00 |
yuanshuai
|
8d6c58352b
|
【四象心法】bug修改
|
2021-09-11 18:05:55 +08:00 |
yuanshuai
|
0d32db8623
|
【四象心法】bug修改
|
2021-09-11 17:50:21 +08:00 |
jiaoyangna
|
f37eec36e3
|
推送礼包文字描述修改提交
|
2021-09-11 17:27:15 +08:00 |
jiaoyangna
|
3ec8e9ee31
|
去掉空格
|
2021-09-11 17:21:38 +08:00 |
jiaoyangna
|
0a955034c7
|
【ID1018447】
【送神祠】阵营筛选的选中框资源错误
|
2021-09-11 17:19:37 +08:00 |
jiaoyangna
|
4e74731a43
|
【ID1018450】
【无尽副本】一键上阵会上阵空血神将
|
2021-09-11 17:11:39 +08:00 |
jiaoyangna
|
c98f2c1f02
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua
|
2021-09-11 17:06:01 +08:00 |
jiaoyangna
|
d41a0adeb1
|
推送礼包文案修改提交
|
2021-09-11 17:04:32 +08:00 |
gaoxin
|
7df51e8929
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
|
2021-09-11 16:52:33 +08:00 |
wangzhenxing
|
79778b6eec
|
【战斗】===========被动261 修改
|
2021-09-11 16:04:06 +08:00 |
wangzhenxing
|
d9214666c2
|
玉虚论道回放优化
|
2021-09-11 16:00:39 +08:00 |
ZhangBiao
|
41282c144c
|
【七界试炼】七界币增加加号
|
2021-09-11 15:47:19 +08:00 |
gaoxin
|
badf72a6f8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-11 15:22:55 +08:00 |
jiaoyangna
|
f49634a6fb
|
【ID1018456】
【新推送礼包】礼包文案需要修改
|
2021-09-11 15:18:47 +08:00 |
gaoxin
|
1c6599c17a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-11 15:13:02 +08:00 |
wangzhenxing
|
4b5c55a1ab
|
qqq
|
2021-09-11 15:05:37 +08:00 |
jiaoyangna
|
14559c4d6a
|
【ID1018450】
【无尽副本】一键上阵会上阵空血神将
|
2021-09-11 14:38:12 +08:00 |
yuanshuai
|
38947760c1
|
【四象心法】bug修改
|
2021-09-11 13:37:26 +08:00 |
wangzhenxing
|
cbb088a491
|
他人队伍灵兽修改
|
2021-09-10 22:13:48 +08:00 |
wangzhenxing
|
489f6f7e37
|
编对拖动英雄保存队伍修改
|
2021-09-10 21:34:45 +08:00 |
gaoxin
|
ad182335d9
|
【推送礼包】名称修改
|
2021-09-10 19:52:14 +08:00 |
gaoxin
|
81421a2e49
|
【推送礼包】文字错误修改
|
2021-09-10 19:52:08 +08:00 |
ZhangBiao
|
4eb8e566fe
|
【七界试炼】战斗结束提交
|
2021-09-10 18:36:39 +08:00 |
gaoxin
|
10783ed104
|
【推送礼包】配置错误
|
2021-09-10 18:27:39 +08:00 |
wangzhenxing
|
16289857a5
|
aaaa
|
2021-09-10 18:21:04 +08:00 |
gaoxin
|
eaf36b56ca
|
Revert "【礼包拍脸】修复报错"
This reverts commit 7bfa26d144.
|
2021-09-10 17:56:53 +08:00 |
gaoxin
|
5af9e9f0ed
|
【编队】修复报错
|
2021-09-10 17:30:26 +08:00 |
gaoxin
|
7bfa26d144
|
【礼包拍脸】修复报错
|
2021-09-10 16:44:17 +08:00 |
ZhangBiao
|
d6725f3320
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
|
2021-09-10 16:39:43 +08:00 |
gaoxin
|
f7d1601c79
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
|
2021-09-10 16:26:34 +08:00 |
gaoxin
|
16633b37a8
|
【编队优化】
|
2021-09-10 16:25:38 +08:00 |
wangzhenxing
|
e2f7284507
|
qqqq
|
2021-09-10 15:50:24 +08:00 |
yuanshuai
|
e91140175f
|
四象心法添加通用等级限制
|
2021-09-10 15:44:32 +08:00 |
ZhangBiao
|
42df2f4af5
|
【七界试炼】提交
|
2021-09-10 15:23:15 +08:00 |
yuanshuai
|
ee557e993a
|
开启修行等级限制
|
2021-09-10 15:08:50 +08:00 |
yuanshuai
|
a89d168e50
|
【四象心法】功能完善
|
2021-09-10 14:37:47 +08:00 |
yuanshuai
|
1327abb290
|
四象心法修改
|
2021-09-10 11:22:08 +08:00 |
ZhangBiao
|
2d003aaafd
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-09-10 10:33:44 +08:00 |
ZhangBiao
|
cef2b42bcc
|
【七界试炼】提交
|
2021-09-10 10:30:50 +08:00 |