ZhangBiao
|
d49d73dcb5
|
【寻宝迷踪】跳转提交
|
2021-09-15 19:14:18 +08:00 |
ZhangBiao
|
45de3d5c99
|
【七界试炼】提交
|
2021-09-15 18:09:21 +08:00 |
ZhangBiao
|
faacb77b2e
|
【协议】meta提交
|
2021-09-15 15:34:48 +08:00 |
ZhangBiao
|
045134941d
|
【鸿蒙阵】协议
|
2021-09-15 15:19:38 +08:00 |
ZhangBiao
|
7dbb75741e
|
【协议 和 meta】
|
2021-09-15 15:06:31 +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 |
skuld
|
2c9f80f8f2
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/14,17:05:31
|
2021-09-14 17:05:31 +08:00 |
gaoxin
|
12562b2ae2
|
【锻器阁】修复宝物详细打开两次显示异常
|
2021-09-14 16:56:33 +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 |
ZhangBiao
|
1de0eda8bd
|
【适配】觉醒1080*2550左下角“等级上限”文字被切
|
2021-09-13 20:02:05 +08:00 |
ZhangBiao
|
1251150a9e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-13 19:53:14 +08:00 |
ZhangBiao
|
afa857f134
|
【灵兽优化】灵兽升星需求数字移动至ICON下方
|
2021-09-13 19:53:05 +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
|
b4cd343f0e
|
【七界试炼】资源文件提交
|
2021-09-13 18:10:36 +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 |
yuanshuai
|
bee3fa5099
|
图片资源修改提交
|
2021-09-13 14:37:04 +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
|
0d6e6908b9
|
【四象心法】bug修改
|
2021-09-11 17:59:27 +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
|
7bce643c71
|
【尝试修复IOS不明原因报错】
|
2021-09-10 16:31:29 +08:00 |
gaoxin
|
8a275f0c8e
|
【跨服界面】玉虚显示优化提交
|
2021-09-10 16:28:29 +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
|
48d06c3a76
|
资源配置文件提交
|
2021-09-10 11:25:15 +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 |
yuanshuai
|
a5271e5a38
|
【四象心法】协议提交
|
2021-09-10 09:51:57 +08:00 |
yuanshuai
|
4c66f50e66
|
Merge branch 'china/dev' into 0功能/四象心法
# Conflicts:
# 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/Practice/PracticePanel.lua
|
2021-09-10 09:38:55 +08:00 |
wangzhenxing
|
3257b89e70
|
eeeeeeee
|
2021-09-09 23:01:23 +08:00 |
yuanshuai
|
247ad9fdc7
|
【四象心法提交】
|
2021-09-09 20:45:12 +08:00 |
wangzhenxing
|
159f2e2494
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua
|
2021-09-09 20:37:53 +08:00 |
wangzhenxing
|
a1c21eb441
|
qqqqq
|
2021-09-09 20:32:02 +08:00 |
gaoxin
|
8bb679214b
|
【玉虚】QA提示添加
|
2021-09-09 19:21:50 +08:00 |
jiaoyangna
|
c5fc2ddedb
|
推送礼包修改提交
|
2021-09-09 18:11:37 +08:00 |
gaoxin
|
ed1f153fa1
|
【玉虚】挑战界面动画添加,优化界面显示,挑战完成后关闭界面时刷新挑战列表
|
2021-09-09 18:04:56 +08:00 |
jiaoyangna
|
ce674fc2ab
|
推送礼包文案修改
|
2021-09-09 17:31:25 +08:00 |
wangzhenxing
|
48e25d05e7
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-09 16:47:34 +08:00 |
wangzhenxing
|
21a222cb27
|
aaaaaaaa
|
2021-09-09 16:47:18 +08:00 |
gaoxin
|
1094c3678a
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-09 16:40:34 +08:00 |
gaoxin
|
b29d7b43fe
|
【玉虚】每日挑战奖励显示优化
|
2021-09-09 16:40:29 +08:00 |
wangzhenxing
|
ea457002be
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-09 16:27:53 +08:00 |
wangzhenxing
|
c27379226c
|
aaaaaaaaaaaaa
|
2021-09-09 16:27:36 +08:00 |
gaoxin
|
b1c987b16f
|
【玉虚】界面显示优化,星星显示优化
|
2021-09-09 16:22:35 +08:00 |
wangzhenxing
|
49a7a2b242
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-09 15:44:33 +08:00 |
wangzhenxing
|
0d82056bc2
|
主界面显示修改
|
2021-09-09 15:44:19 +08:00 |
gaoxin
|
065734184e
|
【玉虚】商店跳转添加
|
2021-09-09 15:16:41 +08:00 |
jiaoyangna
|
fd29cae402
|
界面销毁时删除红点绑定
|
2021-09-09 14:27:38 +08:00 |
gaoxin
|
60b842e2ab
|
【排行榜】报错修复
|
2021-09-09 14:05:44 +08:00 |
jiaoyangna
|
d010e309ca
|
建木神树 升级修改提交
|
2021-09-09 14:03:14 +08:00 |
wangzhenxing
|
a58b5f2d88
|
玉虚论道提交
|
2021-09-09 11:48:09 +08:00 |
gaoxin
|
3e3d0d9416
|
Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-09-09 11:22:47 +08:00 |
gaoxin
|
5d739f1291
|
【十绝阵】排行滑动数据错乱
|
2021-09-09 11:19:11 +08:00 |
ZhangBiao
|
1fefbb43e6
|
【七界试炼】提交
|
2021-09-09 11:10:43 +08:00 |
jiaoyangna
|
4727998055
|
没有图片问题修改
(cherry picked from commit 76d8399ac9ecd0c999ed6e8b53c7b7e231b73a16)
|
2021-09-09 10:55:42 +08:00 |
gaoxin
|
77ea33d675
|
【商店】从其他界面返回时刷新显示
|
2021-09-09 10:50:03 +08:00 |
gaoxin
|
f4d0afde52
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-09 10:45:45 +08:00 |
gaoxin
|
5e938b5141
|
【巅峰赛】选拔赛组界面添加角色信息展示-修复查看编队是主线编队的问题
|
2021-09-09 10:45:40 +08:00 |
jiaoyangna
|
f07b92346a
|
www下载错误卡死修改
(cherry picked from commit 8c146837d826d97820a4eef73f1a125bf448dd39)
|
2021-09-09 10:43:08 +08:00 |
jiaoyangna
|
ef469e7ce7
|
山河社稷图引导卡死修改
|
2021-09-08 19:02:34 +08:00 |
gaoxin
|
021de51a59
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-08 18:29:05 +08:00 |
gaoxin
|
29d1b095e5
|
【碎片详情】碎片详情添加灵兽和神将的查看-特殊碎片不显示查看按钮
|
2021-09-08 18:28:50 +08:00 |
gaoxin
|
992608f7a4
|
【无尽地图】部分事件未解绑
|
2021-09-08 18:27:44 +08:00 |
gaoxin
|
c4bced89f7
|
【战斗校验】山河社稷图,跨服战斗,地图战斗添加战斗校验
|
2021-09-08 18:27:20 +08:00 |
jiaoyangna
|
250683a822
|
山河社稷图引导卡死修改
|
2021-09-08 18:19:51 +08:00 |
ZhangBiao
|
b05227f79e
|
【七界试炼】提交
|
2021-09-08 17:32:48 +08:00 |
ZhangBiao
|
2fe984719b
|
【七界试炼】遗物1/2
|
2021-09-08 16:26:40 +08:00 |
ZhangBiao
|
6ec532f769
|
【七界试炼】排行奖励
|
2021-09-08 14:36:37 +08:00 |
liujiaqi
|
947a4fa368
|
【资源】织女技能字
|
2021-09-08 14:02:27 +08:00 |
luyao
|
150f6e0909
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:51:49
|
2021-09-08 13:51:49 +08:00 |
luyao
|
b05a0b108d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-08 13:50:01 +08:00 |
luyao
|
9b71c0e53e
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:45:19
|
2021-09-08 13:45:19 +08:00 |
luyao
|
681d0be397
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:44:18
|
2021-09-08 13:44:18 +08:00 |
jiaoyangna
|
7abd0955e2
|
【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
|
2021-09-08 12:19:59 +08:00 |
jiaoyangna
|
1757b3cad7
|
好友宝物修改提交
|
2021-09-08 12:00:34 +08:00 |
jiaoyangna
|
ed7c2d9d5e
|
装备界面修改
|
2021-09-08 11:45:04 +08:00 |
jiaoyangna
|
c18094ff97
|
精炼等级位置修改
|
2021-09-08 11:37:37 +08:00 |
jiaoyangna
|
b1b0bf1cab
|
【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
|
2021-09-08 11:11:30 +08:00 |
jiaoyangna
|
a012ece114
|
【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
|
2021-09-08 10:27:26 +08:00 |
ZhangBiao
|
1693300255
|
【七界试炼】目标特性
|
2021-09-08 10:06:24 +08:00 |
gaoxin
|
d6961c19fe
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-07 19:43:34 +08:00 |
gaoxin
|
2a23609ed6
|
【战斗】添加缺失的方法
|
2021-09-07 19:43:08 +08:00 |
ZhangBiao
|
ea1b521143
|
【七界试炼】提交
|
2021-09-07 19:27:05 +08:00 |
ZhangBiao
|
adb77b501e
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-09-07 19:26:13 +08:00 |
ZhangBiao
|
db522d563e
|
【七界试炼】先显示界灵
|
2021-09-07 19:23:16 +08:00 |
jiaoyangna
|
4fd5f70e5b
|
商店购买灵兽不弹恭喜获得修改
(cherry picked from commit 1cbd4a8965)
|
2021-09-07 19:17:13 +08:00 |
jiaoyangna
|
1cbd4a8965
|
商店购买灵兽不弹恭喜获得修改
|
2021-09-07 19:15:46 +08:00 |
luyao
|
2972a973c5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-07 19:00:24 +08:00 |
luyao
|
67326aa278
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/07,19:00:05
|
2021-09-07 19:00:05 +08:00 |
luyao
|
19551d50f9
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/07,18:46:08
|
2021-09-07 18:46:09 +08:00 |
wangzhenxing
|
03b2acbb91
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-09-07 18:45:25 +08:00 |
wangzhenxing
|
c531b3776b
|
玉虚论道提交
|
2021-09-07 18:27:23 +08:00 |
gaoxin
|
2fa2fe0a28
|
【织女】live2d资源没有透明通道
|
2021-09-07 18:26:43 +08:00 |
ZhangBiao
|
8c95c7f8ad
|
【七界试炼】主界面基本完成
|
2021-09-07 18:09:33 +08:00 |
zhangshanxue
|
e4f65ba04b
|
Merge branch 'china/test' into china/xq
|
2021-09-07 18:07:31 +08:00 |
wangzhenxing
|
5f0bfe53bd
|
玉虚论道提交
|
2021-09-07 17:05:46 +08:00 |
gaoxin
|
8b57b7df1f
|
【逍遥游】西贺牛州选定区域优化
|
2021-09-07 15:42:05 +08:00 |
gaoxin
|
0bd0137a2b
|
【战斗】v1.0.57
1、尝试修复孙悟空大招不会增加伤害的问题
2、添加用于debug的log
|
2021-09-07 15:14:10 +08:00 |
gaoxin
|
79832f3232
|
【碎片详情】碎片详情添加灵兽和神将的查看
|
2021-09-07 11:40:12 +08:00 |
gaoxin
|
19e83da85c
|
【资源】资源名重复
|
2021-09-07 10:27:34 +08:00 |
gaoxin
|
b74d5ebf38
|
【资源】资源名重复
|
2021-09-07 10:27:09 +08:00 |
zhangshanxue
|
c3dd7b40c4
|
Merge branch 'china/test' into china/xq
|
2021-09-06 19:24:18 +08:00 |
gaoxin
|
0febc6ae6a
|
【背包】修复滑动后切换页签不回到最顶部的 问题
|
2021-09-06 19:23:56 +08:00 |
gaoxin
|
b5ad62620f
|
【背包】修复滑动后切换页签不回到最顶部的 问题
|
2021-09-06 19:23:41 +08:00 |
jiaoyangna
|
466bee75bd
|
四灵排行榜类型修改
|
2021-09-06 19:10:26 +08:00 |
gaoxin
|
17ebbc1872
|
【优化】灵兽商城商品上显示当前已有的灵兽碎片
|
2021-09-06 18:19:45 +08:00 |
gaoxin
|
b953fac2a0
|
【巅峰赛】选拔赛组界面添加角色信息展示
|
2021-09-06 17:58:31 +08:00 |
ZhangBiao
|
6078ae545a
|
【七界试炼】提交
|
2021-09-06 17:21:53 +08:00 |
zhangshanxue
|
053650b3e7
|
Merge branch 'china/test' into china/xq
|
2021-09-06 16:36:25 +08:00 |
gaoxin
|
34b09a565e
|
Merge branch 'china/dev' into china/test
|
2021-09-06 16:36:04 +08:00 |
gaoxin
|
59ec0d6f20
|
【觉醒】修复会自动选择鸿蒙阵共鸣神将的问题
|
2021-09-06 16:35:46 +08:00 |
zhangshanxue
|
8c277426e5
|
【奖励】修复关闭界面时部分数据未还原
|
2021-09-06 13:55:12 +08:00 |
zhangshanxue
|
54cae546af
|
Merge branch 'china/test' into china/xq
|
2021-09-06 11:47:33 +08:00 |
gaoxin
|
6f08fe74b2
|
Merge branch 'china/dev' into china/test
|
2021-09-06 11:46:54 +08:00 |
gaoxin
|
11495d1076
|
【山河社稷图】修复奖励界面报错导致卡死
|
2021-09-06 11:45:30 +08:00 |
ZhangBiao
|
d3ee7eda1d
|
【七界试炼】资源提交
|
2021-09-06 11:42:32 +08:00 |
ZhangBiao
|
2d7ba67846
|
【七界试炼】提交
|
2021-09-06 11:37:49 +08:00 |
ZhangBiao
|
d564f0cf11
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-09-06 11:16:40 +08:00 |
ZhangBiao
|
a471905a9f
|
Merge branch 'china/dev' into 0功能/七界试炼
|
2021-09-06 11:13:15 +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
|
17f6cb8ff1
|
报错修改
|
2021-09-03 18:43:03 +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
|
21d6b01106
|
【修行】元婴期突破空白文字修改
|
2021-09-03 15:10:38 +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 |
zhangshanxue
|
4b6bce3b32
|
Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq
|
2021-09-02 20:16:05 +08:00 |
jiaoyangna
|
e35b64be86
|
generalpopup 冲突解决
|
2021-09-02 19:52:01 +08:00 |
zhangshanxue
|
03b62b4e44
|
Merge branch 'china/dev' into china/test
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian/Prefab/fx_yangjian_shouji.prefab.meta
|
2021-09-02 19:45:05 +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
|
96f2530ae8
|
加号修改
|
2021-09-02 16:20:33 +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
|
aa26a94d60
|
【防沉迷】修复切服不生效,添加防沉迷登录提示
|
2021-09-02 16:00:46 +08:00 |
gaoxin
|
45ddf4e09e
|
【防沉迷】修复切服不生效,添加防沉迷登录提示
|
2021-09-02 14:27:18 +08:00 |
jiaoyangna
|
1dd4e984cb
|
【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
|
2021-09-02 14:22:50 +08:00 |
jiaoyangna
|
f087a9aa71
|
Revert "预设适配修改提交"
This reverts commit a592f4d5f3.
|
2021-09-02 14:20:26 +08:00 |
ZhangBiao
|
61c16f60f2
|
【优化】将竞技场赛季倒计时提示文字改为能看清的文字
|
2021-09-02 13:44:42 +08:00 |
jiaoyangna
|
68ed8e3b40
|
位置修改
|
2021-09-02 11:42:43 +08:00 |
jiaoyangna
|
264328e859
|
适配修改
|
2021-09-02 11:38:49 +08:00 |
ZhangBiao
|
9fe8a5c0d2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-02 11:34:26 +08:00 |
ZhangBiao
|
d3f7213de0
|
【鸿蒙阵】1级的九河神女,再加一个330级觉醒将,送掉1级将,可以直接开启鸿蒙碑
|
2021-09-02 11:34:15 +08:00 |
jiaoyangna
|
a592f4d5f3
|
预设适配修改提交
|
2021-09-02 11:24:09 +08:00 |
jiaoyangna
|
88f88d1249
|
适配修改提交
|
2021-09-02 11:20:18 +08:00 |
ZhangBiao
|
bbca72b6bf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-02 11:19:39 +08:00 |
ZhangBiao
|
6bbf30e344
|
【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000
|
2021-09-02 11:19:29 +08:00 |
liujiaqi
|
e9bb0163de
|
【资源】杨戬施法特效
|
2021-09-02 10:42:28 +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
|
75fc33c18b
|
回放资源修改提交
|
2021-09-01 18:17:14 +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 |
wangzhenxing
|
8476199128
|
玉虚论道段位特效提交
|
2021-09-01 16:20:52 +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 |