gaoxin
|
11495d1076
|
【山河社稷图】修复奖励界面报错导致卡死
|
2021-09-06 11:45:30 +08:00 |
zhangshanxue
|
ddab583582
|
Merge branch 'china/dev' into china/xq
|
2021-09-06 11:02:57 +08:00 |
gaoxin
|
17001dd7d8
|
【防沉迷】游戏内添加未成年人判断
|
2021-09-06 11:00:34 +08:00 |
jiaoyangna
|
129c5d67d1
|
Merge branch '0功能/silingshilian' into china/xq
|
2021-09-03 18:57:34 +08:00 |
jiaoyangna
|
5af2fc261d
|
心魔修改提交
|
2021-09-03 18:56:46 +08:00 |
zhangshanxue
|
337000c21f
|
Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq
|
2021-09-03 18:45:19 +08:00 |
jiaoyangna
|
1b82990227
|
【ID1018356】
【四灵试炼】在线过渡第二天,新开启的试炼入口没红点,关闭的入口红点不消失
|
2021-09-03 16:29:30 +08:00 |
zhangshanxue
|
4d98bd0081
|
Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq
|
2021-09-03 16:12:28 +08:00 |
zhangshanxue
|
39fc099fe6
|
Merge branch 'china/dev' into china/xq
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-09-03 16:01:20 +08:00 |
jiaoyangna
|
fb4a7afdc0
|
【ID1018360】
【四灵试炼】助战入口显示红点,里面没可操作的神将
|
2021-09-03 15:27:55 +08:00 |
jiaoyangna
|
5ffd4eab51
|
跑马灯修改提交
|
2021-09-03 15:14:18 +08:00 |
ZhangBiao
|
68791a5745
|
【战力】连续打开变负数修改
|
2021-09-03 11:10:24 +08:00 |
ZhangBiao
|
009a17a25a
|
【战力】漏提交
|
2021-09-03 10:19:51 +08:00 |
ZhangBiao
|
5ea7acdef7
|
【幸运探宝】提交
|
2021-09-02 22:35:44 +08:00 |
ZhangBiao
|
72c42eb871
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-02 22:25:08 +08:00 |
ZhangBiao
|
08e8944e47
|
【战力问题】PVP增减伤引起的战力不统一问题修改
|
2021-09-02 22:24:58 +08:00 |
gaoxin
|
316adf6fbd
|
【登录】优化登录失败时,界面文字提示
|
2021-09-02 22:12:58 +08:00 |
ZhangBiao
|
fbfa80611a
|
【幸运摊薄】时间显示
|
2021-09-02 20:58:11 +08:00 |
jiaoyangna
|
4d5876eb28
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua
|
2021-09-02 19:33:48 +08:00 |
jiaoyangna
|
773d31f146
|
报错修改
|
2021-09-02 18:18:17 +08:00 |
jiaoyangna
|
3011fc531f
|
神树升级修改提交
|
2021-09-02 18:08:35 +08:00 |
ZhangBiao
|
f6d05b433d
|
【神将属性】本服排行榜查看神将属性,与背包神将情报中属性不一致
|
2021-09-02 18:07:49 +08:00 |
jiaoyangna
|
19f1815558
|
特效修改提交
|
2021-09-02 17:50:59 +08:00 |
jiaoyangna
|
13909e60aa
|
编队id修改
|
2021-09-02 17:29:44 +08:00 |
jiaoyangna
|
8ae3228319
|
无挑战次数描述修改
|
2021-09-02 16:38:51 +08:00 |
jiaoyangna
|
31dd32a19b
|
添加最大等级限制
|
2021-09-02 16:33:51 +08:00 |
jiaoyangna
|
37c1c77737
|
添加道具 太初之气 加号
|
2021-09-02 16:17:26 +08:00 |
jiaoyangna
|
ac0955bb13
|
宝器修改提交
|
2021-09-02 16:12:37 +08:00 |
jiaoyangna
|
186b2ca0c3
|
四灵修改提交
|
2021-09-02 16:09:04 +08:00 |
gaoxin
|
45ddf4e09e
|
【防沉迷】修复切服不生效,添加防沉迷登录提示
|
2021-09-02 14:27:18 +08:00 |
ZhangBiao
|
d3f7213de0
|
【鸿蒙阵】1级的九河神女,再加一个330级觉醒将,送掉1级将,可以直接开启鸿蒙碑
|
2021-09-02 11:34:15 +08:00 |
jiaoyangna
|
88f88d1249
|
适配修改提交
|
2021-09-02 11:20:18 +08:00 |
ZhangBiao
|
6bbf30e344
|
【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000
|
2021-09-02 11:19:29 +08:00 |
ZhangBiao
|
00bd84f77c
|
【升星有礼】增加新将例会
|
2021-09-02 09:57:17 +08:00 |
jiaoyangna
|
3ef0ad39b6
|
【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
|
2021-09-01 20:06:09 +08:00 |
jiaoyangna
|
615aaa0d88
|
【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
|
2021-09-01 19:59:37 +08:00 |
jiaoyangna
|
5b8001ce28
|
【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物
(cherry picked from commit 41831fad79)
|
2021-09-01 19:36:19 +08:00 |
jiaoyangna
|
41831fad79
|
【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物
|
2021-09-01 19:35:28 +08:00 |
jiaoyangna
|
9ab223d577
|
【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
|
2021-09-01 19:20:34 +08:00 |
wangzhenxing
|
3e36a537b3
|
[战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改
|
2021-09-01 18:40:32 +08:00 |
jiaoyangna
|
f49deb2471
|
回放修改提交
|
2021-09-01 18:13:58 +08:00 |
jiaoyangna
|
ae71f6941d
|
四灵修改提交
|
2021-09-01 18:10:51 +08:00 |
jiaoyangna
|
3b8fc3700f
|
排行榜修改提交
|
2021-09-01 17:21:33 +08:00 |
jiaoyangna
|
f516731201
|
一键上阵修改提交
|
2021-09-01 17:12:25 +08:00 |
jiaoyangna
|
bfe127012e
|
排行榜修改提交
|
2021-09-01 16:39:09 +08:00 |
jiaoyangna
|
19be216616
|
升级修改提交
|
2021-09-01 16:25:58 +08:00 |
jiaoyangna
|
3373e3daf4
|
升级修改提交
|
2021-09-01 16:07:33 +08:00 |
jiaoyangna
|
0f3e76e00f
|
层级修改
|
2021-09-01 14:52:13 +08:00 |
jiaoyangna
|
3372e2a965
|
已激活属性之间的空隙过大
|
2021-09-01 14:49:58 +08:00 |
jiaoyangna
|
4f266a20b9
|
红点问题修改提交
|
2021-09-01 14:17:21 +08:00 |
jiaoyangna
|
13e7935d1d
|
下方显示替换红点,点击一键装备无法替换
|
2021-09-01 12:47:30 +08:00 |
jiaoyangna
|
1744845cba
|
建木神树转移到修行
|
2021-09-01 11:57:15 +08:00 |
jiaoyangna
|
0654020f6a
|
建木神树快速升级
|
2021-09-01 11:49:22 +08:00 |
jiaoyangna
|
1245d7635d
|
四灵修改
|
2021-09-01 11:02:07 +08:00 |
jiaoyangna
|
49a4b32138
|
四灵第二次修改
|
2021-09-01 10:43:57 +08:00 |
jiaoyangna
|
a12c9330c7
|
四灵第二次修改提交
|
2021-09-01 10:08:25 +08:00 |
jiaoyangna
|
56af6f1a11
|
第一次bug修改提交
|
2021-08-31 20:22:59 +08:00 |
jiaoyangna
|
ad9e76bda5
|
四灵试炼修改提交
|
2021-08-31 19:03:29 +08:00 |
jiaoyangna
|
d9bef4f49a
|
战力修改提交
|
2021-08-31 18:08:57 +08:00 |
jiaoyangna
|
207a4eb512
|
战力修改提交
|
2021-08-31 18:07:34 +08:00 |
jiaoyangna
|
f712786650
|
排行榜宝物数据修改
|
2021-08-31 17:50:58 +08:00 |
jiaoyangna
|
82b992c4ca
|
我的助战报错修改提交
|
2021-08-31 17:12:30 +08:00 |
jiaoyangna
|
d660fe362e
|
装备宝物界面修改提交
|
2021-08-31 17:06:01 +08:00 |
jiaoyangna
|
ac22bd000b
|
装备宝物界面修改提交
|
2021-08-31 17:02:22 +08:00 |
jiaoyangna
|
dd93f737ff
|
排行榜上好友宝器修改
|
2021-08-31 15:05:17 +08:00 |
gaoxin
|
8a0b1c80a2
|
【战斗】被动添加时Log
|
2021-08-31 14:48:44 +08:00 |
jiaoyangna
|
d7d8a6071b
|
特希奥层级修改提交
|
2021-08-31 14:41:35 +08:00 |
gaoxin
|
4e8e552ca8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-31 14:29:46 +08:00 |
wangzhenxing
|
7eeebb014e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-31 14:26:02 +08:00 |
wangzhenxing
|
8c6c57d916
|
[战斗]=============被动263 269 274 332 112 145 修改提交
|
2021-08-31 14:25:43 +08:00 |
gaoxin
|
93413b3b07
|
【战斗】添加一些战斗日志
|
2021-08-31 14:25:29 +08:00 |
jiaoyangna
|
72931e8ad6
|
失败返回报错修改
|
2021-08-31 13:59:03 +08:00 |
gaoxin
|
c67c9fb93b
|
【战斗】修复战斗报错
|
2021-08-31 13:44:13 +08:00 |
jiaoyangna
|
13f74e0185
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-31 11:39:16 +08:00 |
jiaoyangna
|
7713a65826
|
排行榜宝器修改
|
2021-08-31 11:08:12 +08:00 |
ZhangBiao
|
4e9ce855f2
|
【玩家神将信息界面】魂印本身战力不增加修改
|
2021-08-30 18:45:21 +08:00 |
jiaoyangna
|
4801852d88
|
神应修改提交
|
2021-08-30 18:09:06 +08:00 |
jiaoyangna
|
1ea100ed83
|
神将情报界面装备宝物修改提交
|
2021-08-30 16:44:26 +08:00 |
ZhangBiao
|
1f2a21a587
|
【推荐工会】
|
2021-08-30 16:24:30 +08:00 |
ZhangBiao
|
f484e60f87
|
【工会推荐】搜索修改
|
2021-08-30 15:37:10 +08:00 |
ZhangBiao
|
671f3cfb28
|
【公会推荐】重复打开工会界面名称会重复修改
|
2021-08-30 15:29:22 +08:00 |
jiaoyangna
|
a76f27ecf0
|
四灵提交
|
2021-08-30 14:21:41 +08:00 |
skuld
|
1cb0353b43
|
添加log
|
2021-08-28 17:21:36 +08:00 |
jiaoyangna
|
f11e33efc1
|
添加log
|
2021-08-28 17:12:10 +08:00 |
jiaoyangna
|
dd9392871e
|
十绝阵公会名字显示错误
|
2021-08-28 17:03:22 +08:00 |
gaoxin
|
c19cfb3d49
|
【提审】关闭太初密卷显示
|
2021-08-28 15:26:35 +08:00 |
gaoxin
|
ee4a465c41
|
【角色升星】修复角色达到最大星级依然可以跳转觉醒、进阶页签的问题
|
2021-08-28 15:20:44 +08:00 |
jiaoyangna
|
2fbe372c76
|
四灵修改提交
|
2021-08-27 18:39:45 +08:00 |
wangzhenxing
|
6ef1d6c643
|
【战斗】===========被动115 DOT类Buff 清除逻辑修改
|
2021-08-27 18:02:50 +08:00 |
ZhangBiao
|
7ca7e78761
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-27 15:59:38 +08:00 |
ZhangBiao
|
12c2fd7316
|
【推荐公会】增加分页请求
|
2021-08-27 15:59:22 +08:00 |
wangzhenxing
|
58f34e049b
|
【战斗】=============被动91,160 修改提交
|
2021-08-27 15:27:53 +08:00 |
zhangqiang
|
4abca9f0a2
|
漏提
|
2021-08-27 15:15:42 +08:00 |
zhangqiang
|
50268807c3
|
【十绝阵】左上角数据刷新不及时,得重进界面才变化
|
2021-08-27 15:12:22 +08:00 |
gaoxin
|
792a72676a
|
【适龄提示】
|
2021-08-27 14:20:36 +08:00 |
zhangqiang
|
037c4a5ac8
|
【十绝阵】左上角数据刷新不及时,得重进界面才变化
|
2021-08-27 11:14:12 +08:00 |
ZhangBiao
|
3a102c93fa
|
【觉醒】神将界面觉醒显示
|
2021-08-26 18:54:14 +08:00 |
jiaoyangna
|
ab1a4ea627
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-26 17:42:25 +08:00 |
jiaoyangna
|
cd594275e0
|
四灵试炼修改提交
|
2021-08-26 17:25:02 +08:00 |
gaoxin
|
c325bf563f
|
Revert 回滚错误的合并 4f19f12612
|
2021-08-26 16:43:27 +08:00 |
gaoxin
|
2f9357608a
|
【太初密卷】修改为拉伸的方式
|
2021-08-26 16:30:52 +08:00 |
zhangqiang
|
20554f8fd8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-26 11:49:11 +08:00 |
zhangqiang
|
17e4c209c7
|
【神将列表】排序修改-张彪
|
2021-08-26 11:48:36 +08:00 |
gaoxin
|
eebd99883b
|
【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题
|
2021-08-25 20:59:26 +08:00 |
gaoxin
|
a6e93212d0
|
【数数】修改部分数据到进入游戏时上报
|
2021-08-25 19:38:49 +08:00 |
zhangqiang
|
b44c1a3e8f
|
【装备界面】装备界面替换魂灵宝,会生成一个假的宝物
|
2021-08-25 18:07:05 +08:00 |
jiaoyangna
|
0c7e38a715
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-25 15:25:54 +08:00 |
jiaoyangna
|
404a30a57d
|
四灵修改提交
|
2021-08-25 15:15:50 +08:00 |
wangzhenxing
|
690db47d68
|
【战斗】=========复活,新灼烧特效预设提交
|
2021-08-25 14:37:10 +08:00 |
gaoxin
|
f778b03879
|
【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题
|
2021-08-25 14:27:08 +08:00 |
gaoxin
|
7efb32c51c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-25 07:25:44 +08:00 |
gaoxin
|
642ea1f7cd
|
【太初密卷】喜扑和动游渠道关闭
|
2021-08-25 07:25:38 +08:00 |
zhangqiang
|
256a3e7571
|
【十绝阵】跨服服务器名字显示
|
2021-08-24 18:23:32 +08:00 |
ZhangBiao
|
8af3d5aa39
|
【送神祠】
|
2021-08-23 20:59:30 +08:00 |
ZhangBiao
|
f0a0be43e6
|
【送神祠】灵兽分解
|
2021-08-23 19:45:53 +08:00 |
ZhangBiao
|
bd7383f063
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-23 16:47:26 +08:00 |
ZhangBiao
|
87234641fa
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-23 15:45:24 +08:00 |
ZhangBiao
|
1614afb3bf
|
【排序优化】修改神将界面中的排序规则
|
2021-08-23 15:45:10 +08:00 |
jiaoyangna
|
6ea8e96e59
|
太初秘卷红点修改提交
(cherry picked from commit c69a23be4ab0f01ab2dafe00ed1d9db3574e7314)
|
2021-08-23 14:34:08 +08:00 |
jiaoyangna
|
6a36e5ffd3
|
太初秘卷红点提交
(cherry picked from commit 8d99139640ed01e9ed692d0f74f2923dac24f839)
|
2021-08-23 14:27:49 +08:00 |
jiaoyangna
|
16ca4f84d6
|
太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
|
2021-08-23 14:27:41 +08:00 |
jiaoyangna
|
ca656636ac
|
太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
|
2021-08-23 14:09:43 +08:00 |
Zhang Biao
|
a7350e7f53
|
【修行】测试提交
|
2021-08-21 16:17:29 +08:00 |
ZhangBiao
|
7d93e96d9b
|
【易经宝库】商店特效
|
2021-08-20 16:28:38 +08:00 |
wangzhenxing
|
9a02e18582
|
【战斗】==============被动 141 310 283 330 336 修改提交
|
2021-08-20 16:05:33 +08:00 |
ZhangBiao
|
6c2e75b384
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-20 14:40:19 +08:00 |
zhangqiang
|
864fd20aac
|
【神将召唤引导】当正好赶上两个神将加入卡池的时候,会有弹窗,但是弹窗蒙版会挡住引导按钮
|
2021-08-20 11:44:49 +08:00 |
zhangqiang
|
6ad43f93ed
|
【飘邈之旅】玩法入口文字错误
|
2021-08-20 10:56:14 +08:00 |
wangzhenxing
|
0e16c34677
|
[优化]==========聊天界面称号特效显示修改
|
2021-08-19 14:27:56 +08:00 |
ZhangBiao
|
11b5425f8b
|
【灵兽分解】分解完碎片后,显示错误
|
2021-08-18 17:53:52 +08:00 |
ZhangBiao
|
52bf5c79f2
|
【寻宝迷踪】增加音效
|
2021-08-18 15:31:52 +08:00 |
ZhangBiao
|
06b3814099
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-18 13:44:39 +08:00 |
ZhangBiao
|
30afec1613
|
【寻宝迷踪】预设冲突重新提交
|
2021-08-18 13:43:44 +08:00 |
jiaoyangna
|
e2caaafbc5
|
删除log
|
2021-08-18 09:54:42 +08:00 |
ZhangBiao
|
2612c2e01e
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-08-17 19:53:05 +08:00 |
jiaoyangna
|
bc4af2601b
|
红点修改提交
|
2021-08-17 17:41:00 +08:00 |
jiaoyangna
|
662a760eaf
|
【ID1018142】
【宝物】宝物分解界面,没有精炼加号,统一 一下
|
2021-08-17 17:31:53 +08:00 |
jiaoyangna
|
a23cd88b5b
|
【ID1018146】
【玲珑宝镜】外圈奖励显示10000与奖励预览不一致
|
2021-08-17 17:27:57 +08:00 |
jiaoyangna
|
faf7591cf5
|
玲珑宝镜修改
|
2021-08-17 17:14:03 +08:00 |
ZhangBiao
|
fab5388536
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-08-17 13:47:27 +08:00 |
ZhangBiao
|
9971d286ea
|
【寻宝迷踪】人物箭头提交
|
2021-08-16 15:37:01 +08:00 |
jiaoyangna
|
7a6935eb42
|
太初秘卷修改提交
|
2021-08-16 14:45:13 +08:00 |
jiaoyangna
|
ab89dcfd17
|
去掉字符串前后空格
|
2021-08-16 14:22:58 +08:00 |
jiaoyangna
|
a9d05bf258
|
修改报错日志
|
2021-08-16 14:05:29 +08:00 |
jiaoyangna
|
847dd9a83b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-16 13:57:23 +08:00 |
jiaoyangna
|
74f1bc4d4f
|
太初秘卷适配修改提交
|
2021-08-16 13:57:13 +08:00 |
ZhangBiao
|
c5639ee2c7
|
【寻宝迷踪】提交
|
2021-08-16 11:55:50 +08:00 |
gaoxin
|
4d91c779c9
|
【神将升级】删除原用于防止升级超过突破等级的限制条件
|
2021-08-16 11:33:45 +08:00 |
jiaoyangna
|
51d1ea2524
|
太初秘卷图片修改
|
2021-08-16 11:25:45 +08:00 |
jiaoyangna
|
32aeee8180
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-16 10:46:45 +08:00 |