gaoxin
|
cbc4f3f410
|
【建木神树】修复神树升级后战斗计算异常
|
2022-02-24 02:22:16 +08:00 |
gaoxin
|
43133199cf
|
【云梦豪礼】修复奖励无法领取的问题
|
2022-02-24 00:20:58 +08:00 |
jiaoyangna
|
cadc9337da
|
删除log
|
2022-02-23 18:34:10 +08:00 |
jiaoyangna
|
88a67b0cbf
|
至尊降世修改提交
|
2022-02-23 18:33:40 +08:00 |
jiaoyangna
|
57198fce39
|
至尊降世兼容提交
|
2022-02-23 18:12:22 +08:00 |
jiaoyangna
|
6abf049eb7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-23 17:24:49 +08:00 |
jiaoyangna
|
d0720e17b2
|
【ID1011178】
至尊降世活动拉到1000档
|
2022-02-23 17:24:34 +08:00 |
wangzhenxing
|
255603a71a
|
[战斗]==========被动375修改
|
2022-02-23 14:36:31 +08:00 |
gaoxin
|
30e7ef5bd5
|
【无尽副本】加入神将版本控制判断
|
2022-02-22 14:20:02 +08:00 |
jiaoyangna
|
3cecd32fda
|
【ID1019545】
【公会技能】长按升级至道具不足,继续长按显示升级成功
|
2022-02-22 11:04:41 +08:00 |
jiaoyangna
|
1905b3c175
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-21 18:37:18 +08:00 |
jiaoyangna
|
3ccf3c29a3
|
ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-21 18:36:21 +08:00 |
wangzhenxing
|
51e89fea29
|
英雄觉醒后天赋显示修改
|
2022-02-21 14:25:52 +08:00 |
gaoxin
|
096d0d0dc4
|
【无尽副本】编队列表加入神将版本判断
|
2022-03-02 13:42:48 +08:00 |
gaoxin
|
84f21cbd9b
|
【推荐阵容】加入神将版本判断
|
2022-03-02 13:28:07 +08:00 |
张彪
|
9345c31d8b
|
【战力冲刺】提交
|
2022-02-21 10:40:27 +08:00 |
张彪
|
b51c7b7780
|
【战力冲刺】提交
|
2022-02-18 17:02:27 +08:00 |
张彪
|
05b9c3afa5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-18 16:28:02 +08:00 |
张彪
|
4ca27d13ad
|
【战力冲刺】提交
|
2022-02-18 16:27:49 +08:00 |
wangzhenxing
|
92f3dee3ab
|
【战斗】==========被动226 423 424修改添加提交
|
2022-02-18 16:26:33 +08:00 |
jiaoyangna
|
70cc76deb4
|
恭送神将排序修改提交
|
2022-02-18 15:32:42 +08:00 |
jiaoyangna
|
fbb86f7263
|
恭送神将排序修改提交
|
2022-02-18 15:31:50 +08:00 |
jiaoyangna
|
bfd2ff46a7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-18 15:18:09 +08:00 |
jiaoyangna
|
2986b3964a
|
魂印图鉴修改提交
|
2022-02-18 15:17:28 +08:00 |
张彪
|
3aa934a95e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-18 15:14:33 +08:00 |
张彪
|
51196cf150
|
【灵兽宝阁】新增几档灵兽特惠礼包界面提交
|
2022-02-18 15:14:25 +08:00 |
jiaoyangna
|
42a60c158f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-18 15:09:25 +08:00 |
jiaoyangna
|
1bd0fe5562
|
魂印修改提交
|
2022-02-18 15:08:45 +08:00 |
张彪
|
7083b34f51
|
【战力冲刺】提交
|
2022-02-18 14:05:59 +08:00 |
张彪
|
f9fca9ca93
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-17 17:14:46 +08:00 |
张彪
|
a6d0a4f7f0
|
【战力冲刺】提交
|
2022-02-17 17:14:33 +08:00 |
张彪
|
14af727eab
|
【战力冲刺】提交
|
2022-02-17 16:27:36 +08:00 |
jiaoyangna
|
a76616df31
|
【ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-17 15:13:26 +08:00 |
gaoxin
|
0933331d4a
|
【神将】加入版本控制时间计算错误修改
|
2022-02-24 16:50:36 +08:00 |
gaoxin
|
bfbc3b7195
|
【拍脸】寻仙招募界面显示错误修改
|
2022-02-24 16:49:19 +08:00 |
gaoxin
|
545e06c474
|
Merge branch '0功能/寻仙招募拍脸' into china/dev
|
2022-02-24 15:57:18 +08:00 |
gaoxin
|
63343f88c7
|
【拍脸】寻仙招募拍脸跳转添加引导小手
|
2022-02-24 15:56:53 +08:00 |
gaoxin
|
2342bd8af8
|
【拍脸】寻仙招募拍脸添加
|
2022-02-23 18:08:50 +08:00 |
wangzhenxing
|
5b3c82f0b3
|
【bug】=======图鉴觉醒信息显示修改
|
2022-02-15 10:43:13 +08:00 |
jiaoyangna
|
4ea5d98b31
|
每日豪礼修改提交
|
2022-02-15 10:36:08 +08:00 |
gaoxin
|
f9f34a9d46
|
【天书密卷】加入神将是否进入版本判断
|
2022-02-11 17:07:07 +08:00 |
wangzhenxing
|
3fde93fcd7
|
【战斗】=========效果108修改
|
2022-02-11 16:27:27 +08:00 |
gaoxin
|
c2b4647418
|
【限时Up】加入神将版本判断
|
2022-02-11 16:22:44 +08:00 |
gaoxin
|
0ec5cf102a
|
【心愿】判断神将是否加入版本
|
2022-02-11 16:11:58 +08:00 |
gaoxin
|
2b413264fd
|
【头像】加入英雄是否进入版本判断-删除log
|
2022-02-11 16:06:38 +08:00 |
gaoxin
|
a2ee17f6c3
|
【头像】加入英雄是否进入版本判断
|
2022-02-11 16:05:51 +08:00 |
jiaoyangna
|
7a010e5e7d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 15:58:16 +08:00 |
jiaoyangna
|
e27c51ee93
|
超值返利提交
|
2022-02-11 15:57:58 +08:00 |
张彪
|
e82c6693e5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 15:54:11 +08:00 |
张彪
|
d56afde090
|
【每日特惠】注释代码
|
2022-02-11 15:54:03 +08:00 |
wangzhenxing
|
a645a1f8d7
|
【战斗】=======斩杀方法添加空判断
|
2022-02-11 15:44:36 +08:00 |
jiaoyangna
|
81660bd819
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 15:30:05 +08:00 |
jiaoyangna
|
caa434c726
|
【ID1011130】
【活动优化】超值返利
|
2022-02-11 15:18:20 +08:00 |
gaoxin
|
b6fa8db0cc
|
【图鉴】加入版本判断
|
2022-02-11 15:11:38 +08:00 |
jiaoyangna
|
a17a8604d9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 15:10:05 +08:00 |
jiaoyangna
|
98a095ee46
|
【活动优化】超值返利
|
2022-02-11 15:09:32 +08:00 |
gaoxin
|
320d755e02
|
【神将自选箱】加入英雄版本判断
|
2022-02-11 14:57:01 +08:00 |
jiaoyangna
|
072edac018
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-11 11:26:51 +08:00 |
jiaoyangna
|
7e62f47ca8
|
【ID1011130】
【活动优化】超值返利
|
2022-02-11 11:26:34 +08:00 |
gaoxin
|
18967c9ae2
|
【专属升星】误提交还原
|
2022-02-11 11:18:37 +08:00 |
张彪
|
9ba115e464
|
【每日特惠修改】
|
2022-02-11 10:35:42 +08:00 |
张彪
|
6391c6ea97
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-10 18:23:24 +08:00 |
张彪
|
0bc10a78c8
|
【每日特惠】优化
|
2022-02-10 18:22:48 +08:00 |
gaoxin
|
6f39aa9645
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-10 17:57:23 +08:00 |
gaoxin
|
244db76135
|
【四元阵】修改概率基数的计算方式
|
2022-02-10 17:57:18 +08:00 |
张彪
|
b868d5ff2f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-10 17:53:20 +08:00 |
张彪
|
4659ad0f84
|
【活动优化】每日特惠优化
|
2022-02-10 17:53:00 +08:00 |
wangzhenxing
|
01506ba48c
|
[角色天赋]======角色天赋显示修改
|
2022-02-10 17:52:40 +08:00 |
jiaoyangna
|
0cf058dbb5
|
每日豪礼
|
2022-02-10 17:10:35 +08:00 |
jiaoyangna
|
69997cef10
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-10 16:50:02 +08:00 |
jiaoyangna
|
bd5d09def0
|
【ID1011132】
【活动优化】每日豪礼
|
2022-02-10 16:49:21 +08:00 |
wangzhenxing
|
599ef2e0fc
|
[战斗]=========被动356 422 技能: 108修改
|
2022-02-10 15:29:24 +08:00 |
jiaoyangna
|
8d196f6759
|
天地洪炉心愿修改提交
|
2022-02-08 17:50:09 +08:00 |
张彪
|
7f6cb1a40f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-02-08 14:07:03 +08:00 |
张彪
|
e257033ea6
|
【天地洪炉】增加白金品质宝物碎片
|
2022-02-08 14:06:25 +08:00 |
gaoxin
|
62a9cda5d3
|
【战斗】修复姑获鸟神魂五对所有人生效的问题
|
2022-01-27 13:21:07 +08:00 |
gaoxin
|
1e26aad156
|
【逍遥游】数据打印添加
|
2022-01-26 16:01:45 +08:00 |
张彪
|
1f248db5f0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-26 13:40:20 +08:00 |
张彪
|
1597c0b657
|
【特权商城】无法购买最后i一个名望礼包,修改
|
2022-01-26 13:40:13 +08:00 |
wangzhenxing
|
4af86c7e7f
|
【战斗】=====御甲初始化数值修改
|
2022-01-26 13:29:39 +08:00 |
wangzhenxing
|
7d3e8fd73d
|
[紫府神印]======紫府神印报错修改
|
2022-01-26 10:29:59 +08:00 |
张彪
|
432c92dcf0
|
【超值基金】提交
|
2022-01-24 18:41:18 +08:00 |
张彪
|
017cd79c09
|
【超值基金】提交
|
2022-01-24 18:11:06 +08:00 |
张彪
|
e7b9c54c45
|
【超值基金】提交
|
2022-01-24 18:09:14 +08:00 |
张彪
|
8e85780697
|
【超值寂静】提交
|
2022-01-24 18:03:04 +08:00 |
张彪
|
92d47074a4
|
【超值基金】提交
|
2022-01-24 17:31:40 +08:00 |
张彪
|
d1bb3391ac
|
【超值基金】提交
|
2022-01-24 17:09:55 +08:00 |
wangzhenxing
|
9e73d667a2
|
[战斗]========加御甲显示修改
|
2022-01-24 16:20:07 +08:00 |
jiaoyangna
|
5eca555299
|
浮生门按钮层级修改提交
|
2022-01-24 16:07:21 +08:00 |
jiaoyangna
|
087e83bce7
|
【ID1019501】
【探索】进入地图后,小人显示有血,原地晃
|
2022-01-24 11:23:19 +08:00 |
jiaoyangna
|
775c0a54bc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-24 10:48:53 +08:00 |
jiaoyangna
|
dd2c4a8eb6
|
达人活动报错修改
|
2022-01-24 10:48:29 +08:00 |
wangzhenxing
|
0a51ced090
|
[飞升]=====大脑天宫特效修改
|
2022-01-22 17:08:17 +08:00 |
jiaoyangna
|
4bd7512ade
|
节日修改提交
|
2022-01-22 16:05:55 +08:00 |
jiaoyangna
|
9d755a2c1d
|
可以领取时点击事件修改
|
2022-01-22 15:54:30 +08:00 |
jiaoyangna
|
911ef94fb1
|
跨天红点刷新修改
|
2022-01-22 14:00:01 +08:00 |
jiaoyangna
|
ec7be4c020
|
节日提交
|
2022-01-22 13:27:25 +08:00 |
jiaoyangna
|
5cea36a143
|
节日修改提交
|
2022-01-22 11:37:59 +08:00 |
jiaoyangna
|
227e0f68c1
|
特效提交
|
2022-01-22 11:12:47 +08:00 |
ZhangBiao
|
6e10183d80
|
【命格】命石合成显示调整
|
2022-01-22 10:13:43 +08:00 |
jiaoyangna
|
3a9acbdf19
|
签到好礼提交
|
2022-01-21 18:49:40 +08:00 |
wangzhenxing
|
b18db8765d
|
[飞升]=====飞升特效修改提交
|
2022-01-21 17:09:14 +08:00 |
jiaoyangna
|
1f4c38a710
|
显示修改
|
2022-01-21 14:27:07 +08:00 |
jiaoyangna
|
937ca23dc0
|
探索提交
|
2022-01-21 14:06:30 +08:00 |
wangzhenxing
|
e5494e65ab
|
[飞升]=====图鉴显示修改
|
2022-01-21 13:55:17 +08:00 |
gaoxin
|
4c00b471ad
|
【战斗】添加头像显示
|
2022-01-21 11:59:19 +08:00 |
wangzhenxing
|
ecc7e155a0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-20 18:21:58 +08:00 |
jiaoyangna
|
a2b9a69126
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-20 18:19:04 +08:00 |
wangzhenxing
|
b64234bcb8
|
[飞升]=====特效修改提交
|
2022-01-20 18:18:40 +08:00 |
jiaoyangna
|
676f03e79f
|
众志成城提交
|
2022-01-20 18:18:24 +08:00 |
ZhangBiao
|
68c9886183
|
【家园】特权升级提示错误修改
|
2022-01-20 18:11:28 +08:00 |
wangzhenxing
|
7de5fdac9e
|
[飞升]=====特效问题修改
|
2022-01-20 17:58:57 +08:00 |
jiaoyangna
|
90c21e5a73
|
协议提交
|
2022-01-20 16:17:26 +08:00 |
jiaoyangna
|
039f212694
|
Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-20 15:32:17 +08:00 |
wangzhenxing
|
46f337312e
|
[飞升]========特效修改
|
2022-01-20 15:06:04 +08:00 |
jiaoyangna
|
70d3d943a8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-20 11:42:25 +08:00 |
wangzhenxing
|
e734c4a03d
|
[飞升]=======飞升修改
|
2022-01-20 11:41:20 +08:00 |
jiaoyangna
|
1c24a85612
|
添加红点
|
2022-01-20 11:22:39 +08:00 |
wangzhenxing
|
9831008684
|
[飞升]======飞升特效适配
|
2022-01-19 18:34:35 +08:00 |
gaoxin
|
5a66722aed
|
【无尽副本】优化清除缓存第一次进入无尽副本时任务状态错误
|
2022-01-19 18:32:43 +08:00 |
wangzhenxing
|
7fd7ef19f3
|
[飞升]====卡牌背景修改
|
2022-01-19 17:50:39 +08:00 |
jiaoyangna
|
a797e80b39
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-19 17:47:28 +08:00 |
jiaoyangna
|
a544abe9cc
|
众志成城
|
2022-01-19 17:47:07 +08:00 |
wangzhenxing
|
6ef00a4498
|
[飞升]=====细节调整
|
2022-01-19 16:57:17 +08:00 |
wangzhenxing
|
109648ae93
|
Merge branch 'china/dev' into china/飞升
|
2022-01-19 16:13:20 +08:00 |
wangzhenxing
|
4034a90a33
|
[飞升]======优化修改提交
|
2022-01-19 15:29:47 +08:00 |
gaoxin
|
35648e8762
|
【升级】长按升到最大级了,会无法触发抬起事件,导致升级失败
|
2022-01-19 15:22:11 +08:00 |
gaoxin
|
155dabe7c7
|
【专属升星】选择神将界面打不开
|
2022-01-18 15:07:14 +08:00 |
jiaoyangna
|
b5cc0635ae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 14:49:50 +08:00 |
jiaoyangna
|
ac24c2e0ce
|
【ID1010998】
【春节活动】签到领奖活动
|
2022-01-18 14:48:27 +08:00 |
ZhangBiao
|
54aeaa2ea8
|
【寻仙招募】提交
|
2022-01-18 12:09:43 +08:00 |
wangzhenxing
|
ff5866e00e
|
[法宝详情]=======添加返回按钮
|
2022-01-18 11:57:38 +08:00 |
wangzhenxing
|
4298209c33
|
[战斗]=======护盾buff修改
|
2022-01-18 11:44:36 +08:00 |
gaoxin
|
925db190ee
|
【引导】修复挂机界面打开时触发引导小手不消失的问题
|
2022-01-18 11:38:00 +08:00 |
ZhangBiao
|
558bbfdee1
|
【鸿蒙阵】报错提交
|
2022-01-18 11:20:55 +08:00 |
ZhangBiao
|
4d7c72725a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-18 10:57:09 +08:00 |
ZhangBiao
|
6283677b8f
|
【诸多修改】提交
|
2022-01-18 10:53:25 +08:00 |
wangzhenxing
|
7f9868ca59
|
[bug]=====奖池预览修改,图鉴详情添加点击反馈
|
2022-01-18 10:45:39 +08:00 |
ZhangBiao
|
b316eccd7c
|
【装备】摘星阁属性
|
2022-01-18 10:19:36 +08:00 |
wangzhenxing
|
a6e05ae8e8
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 09:53:04 +08:00 |
wangzhenxing
|
2e0bd1ded7
|
[飞升]=======显示修改
|
2022-01-18 09:47:38 +08:00 |
ZhangBiao
|
f20f722177
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 18:24:12 +08:00 |
ZhangBiao
|
bf3ca7ef08
|
【装备加持】鸿蒙阵共鸣出的装备未受到装备加持加成
|
2022-01-17 18:22:45 +08:00 |
wangzhenxing
|
1de7293630
|
[飞升]======卡牌飞升预设修改
|
2022-01-17 16:53:26 +08:00 |
wangzhenxing
|
d5fd95373f
|
[抽卡奖池]======抽卡奖池预览修改
|
2022-01-17 15:56:27 +08:00 |
wangzhenxing
|
ea10cd65d1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 14:26:54 +08:00 |
ZhangBiao
|
369f7aa1ef
|
【点将台】选择心愿神将,列表动画不正常
|
2022-01-17 14:26:17 +08:00 |
wangzhenxing
|
f257bc2c6d
|
[图鉴]=====图鉴神魂按钮显示修改
|
2022-01-17 14:26:17 +08:00 |
ZhangBiao
|
ae020064ab
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 14:10:19 +08:00 |
ZhangBiao
|
4e00c5e9c3
|
【名望礼包】红点
|
2022-01-17 14:10:08 +08:00 |
jiaoyangna
|
d0023bbcdf
|
神魂显示修改提交
|
2022-01-17 13:56:06 +08:00 |
jiaoyangna
|
7d0c4e21d0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 13:24:04 +08:00 |
jiaoyangna
|
5bd09017e0
|
掩藏神魂
|
2022-01-17 13:23:19 +08:00 |
ZhangBiao
|
e3196e3ca2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 13:16:30 +08:00 |
ZhangBiao
|
409836ffb5
|
【名望礼包】提交
|
2022-01-17 13:16:18 +08:00 |
jiaoyangna
|
a4cbd77a99
|
许愿神将修改提交
|
2022-01-17 11:23:22 +08:00 |
jiaoyangna
|
4c1b1dbc30
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:19:23 +08:00 |
jiaoyangna
|
4abe2d4203
|
Revert "许愿神将修改提交"
This reverts commit fbd1c9aa43 .
|
2022-01-17 11:18:55 +08:00 |
gaoxin
|
58b5702a30
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:06:41 +08:00 |
gaoxin
|
e99f1a2ca7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 11:02:48 +08:00 |
gaoxin
|
69e30f8fd0
|
【关卡】功能引导时关闭小手显示
|
2022-01-17 11:02:33 +08:00 |
wangzhenxing
|
6be87dec74
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 11:00:42 +08:00 |
jiaoyangna
|
501d3758fd
|
升级显示消耗
|
2022-01-17 10:59:48 +08:00 |
jiaoyangna
|
6d3d7f5e4f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-17 10:59:08 +08:00 |
jiaoyangna
|
28b3fb33f3
|
技能报错修改提交
|
2022-01-17 10:56:38 +08:00 |
ZhangBiao
|
ffbdafd13e
|
【修行】红点检测
|
2022-01-17 10:53:06 +08:00 |
wangzhenxing
|
a7ad2ee1f6
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 10:50:14 +08:00 |
ZhangBiao
|
98f89d8a9b
|
【摘星阁+修为】装备属性展示+修为红点检测
|
2022-01-17 10:44:43 +08:00 |
ZhangBiao
|
91f9589043
|
【摘星阁】装备属性
|
2022-01-17 10:33:42 +08:00 |
ZhangBiao
|
e93b2816b4
|
【摘星阁】装备摘星阁属性拆分
|
2022-01-17 10:24:27 +08:00 |
jiaoyangna
|
fbd1c9aa43
|
许愿神将修改提交
|
2022-01-17 09:41:00 +08:00 |
ZhangBiao
|
10070d14ca
|
【跳转】提交
|
2022-01-15 18:29:18 +08:00 |
ZhangBiao
|
a556bf7761
|
【玩家信息】提交
|
2022-01-15 18:17:46 +08:00 |
wangzhenxing
|
0b3007a9c7
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-15 18:16:56 +08:00 |
ZhangBiao
|
aa90cae885
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 18:07:57 +08:00 |
ZhangBiao
|
2b8cb81ff3
|
【充值】跳转修改
|
2022-01-15 18:07:43 +08:00 |
wangzhenxing
|
692c333b34
|
[战斗]========被动421修改提交
|
2022-01-15 17:44:32 +08:00 |
wangzhenxing
|
1d170dfd2d
|
[图鉴]==========图鉴详情修改提交
|
2022-01-15 17:12:40 +08:00 |
ZhangBiao
|
fa7123e998
|
【主题活动】0120-0202寻宝迷踪珍奇宝阁报错
|
2022-01-15 15:53:28 +08:00 |
ZhangBiao
|
3ad8b6b6c3
|
【玩家信息】提交
|
2022-01-15 15:44:08 +08:00 |
ZhangBiao
|
1f9275e9d8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 15:05:35 +08:00 |
ZhangBiao
|
c373f8d014
|
【修改】提交
|
2022-01-15 15:05:26 +08:00 |
wangzhenxing
|
6f56edbdf7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 14:46:55 +08:00 |
ZhangBiao
|
38fb5a9ada
|
【每日特惠】每日特惠中免费和7天的按钮消失了
|
2022-01-15 14:40:06 +08:00 |
wangzhenxing
|
c083c2c903
|
【战斗】====被动419修改
|
2022-01-15 14:38:56 +08:00 |
ZhangBiao
|
756dc54595
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-15 14:35:21 +08:00 |
ZhangBiao
|
f4c1b9d097
|
【修改】提交
|
2022-01-15 14:34:55 +08:00 |
wangzhenxing
|
e8f8f5ca59
|
[图鉴]=====图鉴详情修改提交
|
2022-01-15 14:32:55 +08:00 |
ZhangBiao
|
bca67f4fd6
|
【玩家信息】报错修改
|
2022-01-15 13:26:22 +08:00 |
ZhangBiao
|
28d4b2a8be
|
【玩家信息】提交
|
2022-01-15 13:07:28 +08:00 |
ZhangBiao
|
7feefd2078
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-15 13:01:44 +08:00 |
ZhangBiao
|
fa1c832170
|
【坐骑】增加详细信息
|
2022-01-15 13:00:45 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
wangzhenxing
|
853fde91b2
|
[飞升]============飞升修改提交
|
2022-01-15 12:26:12 +08:00 |
ZhangBiao
|
ed48c7ce00
|
【寻仙招募】修改,提交
|
2022-01-15 10:27:48 +08:00 |
ZhangBiao
|
232491eb95
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-15 09:14:10 +08:00 |
jiaoyangna
|
9f5addf443
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 19:14:04 +08:00 |
jiaoyangna
|
98f23e56ea
|
神将修改提交
|
2022-01-14 19:13:46 +08:00 |
wangzhenxing
|
c2c9eda981
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 18:50:17 +08:00 |
wangzhenxing
|
05377b9595
|
[图鉴]==== 图鉴 图鉴详情界面修改
|
2022-01-14 18:49:49 +08:00 |