gaoxin
|
21e7638a75
|
【特效】优化点对点特效的显示时间,优化特效层级错误的问题
|
2021-11-26 13:58:59 +08:00 |
gaoxin
|
71aa002b13
|
【战斗】前置特效添加延时
|
2021-11-26 13:58:24 +08:00 |
jiaoyangna
|
c5fddcdf7a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 13:19:11 +08:00 |
jiaoyangna
|
14b54c7d5e
|
变身卡名字颜色修改
|
2021-11-26 13:18:45 +08:00 |
wangzhenxing
|
1da1d1457b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 13:08:37 +08:00 |
wangzhenxing
|
180d76f3b9
|
【战斗】========主角技能gm添加字段
|
2021-11-26 13:07:49 +08:00 |
jiaoyangna
|
838d7108bd
|
添加资源条
|
2021-11-26 13:07:45 +08:00 |
jiaoyangna
|
0d18d4595e
|
测试按钮关闭
|
2021-11-26 13:05:07 +08:00 |
jiaoyangna
|
def89bf7e3
|
身外化身提交
|
2021-11-26 12:51:52 +08:00 |
jiaoyangna
|
2212df06ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:39:24 +08:00 |
jiaoyangna
|
1e17151d7f
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-11-26 11:35:57 +08:00 |
jiaoyangna
|
964a1b4fde
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:34:57 +08:00 |
jiaoyangna
|
b78e2335fa
|
身外化身提交
|
2021-11-26 11:34:25 +08:00 |
wangzhenxing
|
bb1402d5e7
|
[战斗]======立绘方向修改
|
2021-11-26 11:24:46 +08:00 |
ZhangBiao
|
4c7268b11a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:09:30 +08:00 |
ZhangBiao
|
c8fa05d5a0
|
【固定活动】提交
|
2021-11-26 11:09:22 +08:00 |
jiaoyangna
|
c0c8a6710c
|
身外化身提交
|
2021-11-26 11:08:48 +08:00 |
gaoxin
|
5557795658
|
【轩辕宝镜】偶现跨0点报错
|
2021-11-26 10:53:49 +08:00 |
gaoxin
|
f5f5a2477d
|
【战斗】怒气层级错误
|
2021-11-26 10:33:30 +08:00 |
gaoxin
|
878e8b095a
|
【森罗幻境】修复老虎机小游戏后音效播放错误
|
2021-11-26 10:29:12 +08:00 |
gaoxin
|
3a574880ea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 10:19:35 +08:00 |
gaoxin
|
ad3ca2e0d2
|
【战斗】新增轩辕宝镜,僧罗幻境战斗类型,四灵试炼回放改为回放类型
|
2021-11-26 10:19:29 +08:00 |
ZhangBiao
|
f83bffaf75
|
【固定活动】提交
|
2021-11-26 10:16:46 +08:00 |
ZhangBiao
|
7f525511c8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 09:54:21 +08:00 |
ZhangBiao
|
45df1fb982
|
【寻仙招募】增加心愿阵营条
|
2021-11-26 09:54:12 +08:00 |
wangzhenxing
|
5449b2357d
|
[战斗]=====效果132修改
|
2021-11-26 09:36:41 +08:00 |
jiaoyangna
|
8a3ca0cb97
|
天地洪炉提交
|
2021-11-25 19:06:20 +08:00 |
jiaoyangna
|
34949242a9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
|
2021-11-25 18:57:48 +08:00 |
jiaoyangna
|
fd22b5a87f
|
天地洪炉提交
|
2021-11-25 18:55:20 +08:00 |
ZhangBiao
|
db5627ab24
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 18:51:46 +08:00 |
ZhangBiao
|
fd97f584cb
|
【固定活动】调整
|
2021-11-25 18:51:36 +08:00 |
wangzhenxing
|
7949e8c21c
|
【战斗】========灵兽卡面翻转提交
|
2021-11-25 18:47:53 +08:00 |
wangzhenxing
|
6927b52365
|
[战斗]=======主角变身卡添加gm
|
2021-11-25 18:36:00 +08:00 |
ZhangBiao
|
a8f666e901
|
【删除活动类型43】
|
2021-11-25 17:27:02 +08:00 |
ZhangBiao
|
cb331c612e
|
【删除活动类那个43】
|
2021-11-25 16:51:35 +08:00 |
ZhangBiao
|
d40b07138c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 16:16:48 +08:00 |
ZhangBiao
|
bd4ce88486
|
【乾坤宝盒】报错修改
|
2021-11-25 16:16:39 +08:00 |
jiaoyangna
|
a248330241
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# 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/ArenaInfoProto_pb.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/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
|
2021-11-25 16:10:14 +08:00 |
gaoxin
|
458b7b2ca5
|
【灵兽】升级时,没有战斗力变化提示
|
2021-11-25 16:03:41 +08:00 |
ZhangBiao
|
2d76df2105
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 15:59:42 +08:00 |
ZhangBiao
|
8da0a81588
|
【寻仙抽】提交
|
2021-11-25 15:59:31 +08:00 |
gaoxin
|
879cf506f5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 15:43:15 +08:00 |
gaoxin
|
4923314bbb
|
【战斗】屏幕震动加入伤害延时时间
|
2021-11-25 15:43:10 +08:00 |
wangzhenxing
|
aff13f8904
|
【战斗】======技能132-140提交
|
2021-11-25 15:07:40 +08:00 |
wangzhenxing
|
b15eaf8b19
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 15:05:10 +08:00 |
wangzhenxing
|
ae8021cd6a
|
[战斗表现]========敌我方立绘镜像显示
|
2021-11-25 15:04:55 +08:00 |
gaoxin
|
b316f54e50
|
【战斗】护盾特效层级问题优化
|
2021-11-25 14:46:46 +08:00 |
gaoxin
|
336321ebf3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 14:44:15 +08:00 |
gaoxin
|
a36714d286
|
【战斗】跳过提示文字:第二回合结束后可以跳过
|
2021-11-25 14:44:10 +08:00 |
ZhangBiao
|
1c9d113a86
|
【活动、修为】界面调整
|
2021-11-25 11:52:35 +08:00 |
ZhangBiao
|
3ffefeea3c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 11:03:17 +08:00 |
ZhangBiao
|
855f658a93
|
【灵兽宝阁】错误修改
|
2021-11-25 11:03:08 +08:00 |
gaoxin
|
347cc3f9ba
|
【每日豪礼】资源68->98
|
2021-11-25 10:47:02 +08:00 |
ZhangBiao
|
e4b0fd1824
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 18:14:37 +08:00 |
ZhangBiao
|
ac768ff163
|
【常驻活动】提交
|
2021-11-24 18:14:25 +08:00 |
gaoxin
|
4607bd2fed
|
Merge branch '0功能/账号id校验' into china/dev
|
2021-11-24 16:03:34 +08:00 |
gaoxin
|
bb15f0056e
|
【战斗】弹道特效不在根据贝塞尔曲线运动
|
2021-11-24 14:42:11 +08:00 |
gaoxin
|
d1ce54c9a9
|
【测试战斗】报错修复
|
2021-11-24 14:22:27 +08:00 |
gaoxin
|
f01889db21
|
【战斗】改为第三回合时战斗就可以跳过
|
2021-11-24 14:21:44 +08:00 |
gaoxin
|
86dff44ce7
|
【主界面按钮】兼容删除了的活动
|
2021-11-24 11:43:46 +08:00 |
ZhangBiao
|
2d25ebb61b
|
【修为】修为调整
|
2021-11-24 11:30:55 +08:00 |
ZhangBiao
|
0e15c3d812
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 10:22:51 +08:00 |
ZhangBiao
|
18648a7622
|
【云游商人】装备文字叠加、显示人名错误修改
|
2021-11-24 10:18:36 +08:00 |
jiaoyangna
|
012847047e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 07:28:50 +08:00 |
jiaoyangna
|
e947ab68b2
|
排行奖励切换奖励显示不正确修改
|
2021-11-24 07:24:17 +08:00 |
gaoxin
|
5462a1ad3b
|
【战斗】弹道特效转向
|
2021-11-23 17:23:35 +08:00 |
gaoxin
|
3f343bb1b2
|
【战斗】关卡和每日副本战斗改为3回合后跳过,其他战斗直接可以跳过
|
2021-11-23 17:22:54 +08:00 |
wangzhenxing
|
9cce1aa31c
|
【战斗表现】======剧情特殊处理敌人名字位置
|
2021-11-23 15:13:43 +08:00 |
jiaoyangna
|
86bf793ba7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-23 14:01:00 +08:00 |
jiaoyangna
|
735b2dc404
|
法宝之灵展示修改
|
2021-11-23 14:00:36 +08:00 |
wangzhenxing
|
b8b1c74f03
|
[战斗]========被动391修改 我方流血显示修改
|
2021-11-23 10:46:52 +08:00 |
jiaoyangna
|
e88f1f7b01
|
【ID1019276】
【法宝聚灵】改排版后,返回按钮遮挡技能描述
|
2021-11-23 10:31:09 +08:00 |
ZhangBiao
|
6cd26e96af
|
【灵脉秘境】纪录换行问题修改
|
2021-11-22 19:11:07 +08:00 |
ZhangBiao
|
fbb58dbfdc
|
【云游商人】不同神将穿戴同一品质装备,弹窗显示的都是一个神将名
|
2021-11-22 18:44:32 +08:00 |
ZhangBiao
|
bdc85fea41
|
【灵脉秘境】红点修改
|
2021-11-22 18:08:48 +08:00 |
ZhangBiao
|
ba1201dd7a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 17:59:55 +08:00 |
ZhangBiao
|
d06d3c6e2f
|
【灵脉秘境】红点判断
|
2021-11-22 17:59:46 +08:00 |
gaoxin
|
95382d530e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 17:37:38 +08:00 |
gaoxin
|
487c0d327a
|
【魂印穿戴】点击穿戴其他神将身上的魂印提示穿戴成功,但不显示,需要来回切换才能刷新并且看到新替换的魂印
|
2021-11-22 17:37:26 +08:00 |
wangzhenxing
|
d9120676f7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 17:22:50 +08:00 |
wangzhenxing
|
134b1aff71
|
【战斗表现】============我方复活后血条不显示修改
|
2021-11-22 17:21:59 +08:00 |
ZhangBiao
|
232e965dbc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 17:20:12 +08:00 |
ZhangBiao
|
f4febd8ed8
|
【灵脉秘境】竞技场pvp切磋报错修改
|
2021-11-22 17:20:04 +08:00 |
wangzhenxing
|
f67006e041
|
【战斗】============战斗超时pvp类型检测添加类型
|
2021-11-22 16:57:46 +08:00 |
ZhangBiao
|
9fe1e610ca
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 16:52:29 +08:00 |
ZhangBiao
|
d688ae8ab9
|
【灵脉秘境】排行错误提交
|
2021-11-22 16:52:21 +08:00 |
gaoxin
|
66670029dc
|
【战斗】修复战斗跳过时,人物回收,但是延时方法依然会执行的问题
|
2021-11-22 16:42:14 +08:00 |
jiaoyangna
|
21fa0c1762
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 16:38:43 +08:00 |
jiaoyangna
|
083d33b237
|
【ID1019215】
【坐骑合成】坐骑合成时拖动进度条可以把当前合成数量变成0,点击加号提示神将已达上限
|
2021-11-22 16:38:24 +08:00 |
wangzhenxing
|
3ec9fd80fd
|
[战斗]======被动360 伤害公式修改只有神将才计算阵营伤害增减
|
2021-11-22 16:34:57 +08:00 |
gaoxin
|
7f68c39f91
|
【灵脉】回放跳过时战斗卡住
|
2021-11-22 16:28:36 +08:00 |
gaoxin
|
f81914dfaf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 16:13:30 +08:00 |
gaoxin
|
d52ca13ff6
|
【战斗】关闭战斗类型打印
|
2021-11-22 16:13:06 +08:00 |
ZhangBiao
|
425d4934b8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 16:11:29 +08:00 |
ZhangBiao
|
ab4faba301
|
【灵脉秘境】主动攻击不会产生红点
|
2021-11-22 16:11:21 +08:00 |
gaoxin
|
e800f29b33
|
【竞技场】查看玩家信息报错
|
2021-11-22 16:06:52 +08:00 |
jiaoyangna
|
7722ede726
|
属性修改提交
|
2021-11-22 15:55:02 +08:00 |
jiaoyangna
|
5e8f8c59a1
|
添加底图
|
2021-11-22 15:48:54 +08:00 |
jiaoyangna
|
ed5cd6ec59
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 15:25:53 +08:00 |
jiaoyangna
|
9d2023c182
|
法宝之灵提交
|
2021-11-22 15:25:26 +08:00 |
wangzhenxing
|
f980485ce2
|
[战斗表现]========足下阴影显示修改
|
2021-11-22 15:18:44 +08:00 |
jiaoyangna
|
9abd87c14b
|
战力添加
|
2021-11-22 15:06:44 +08:00 |
jiaoyangna
|
8bb17fa29c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 15:03:03 +08:00 |
jiaoyangna
|
da218cfc3c
|
添加战力
|
2021-11-22 15:02:42 +08:00 |
ZhangBiao
|
99c4b8f81d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 15:00:54 +08:00 |
ZhangBiao
|
2428034e9d
|
【GM】增加一键法宝碎片
|
2021-11-22 15:00:46 +08:00 |
jiaoyangna
|
7647b0057e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 14:15:55 +08:00 |
ZhangBiao
|
025edbcacf
|
【灵脉秘境】界面修改、红点修改
|
2021-11-22 14:13:49 +08:00 |
jiaoyangna
|
d239f69a98
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 14:12:08 +08:00 |
jiaoyangna
|
197b6f0d45
|
滑动修改提交
|
2021-11-22 14:10:54 +08:00 |
gaoxin
|
f22f47202a
|
【太初密卷】获取网络图片错误时,无法进入游戏
|
2021-11-22 14:06:23 +08:00 |
gaoxin
|
c33963f0b6
|
【点将台】修复新增心愿神将提示只在引导时显示的问题
|
2021-11-22 13:37:58 +08:00 |
gaoxin
|
290911903c
|
【法宝聚灵】修复开启宝箱获取时不显示数字
|
2021-11-22 13:37:12 +08:00 |
ZhangBiao
|
aa52131d3f
|
【灵脉秘境】文字遮挡、跳转
|
2021-11-22 13:27:54 +08:00 |
ZhangBiao
|
cb80384f02
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 12:11:41 +08:00 |
ZhangBiao
|
421f82b882
|
【灵脉秘境】战斗报错修改
|
2021-11-22 12:11:28 +08:00 |
wangzhenxing
|
87f7602f9b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 12:02:22 +08:00 |
wangzhenxing
|
ed8ef42849
|
[战斗]========被动112 258修改
|
2021-11-22 12:01:55 +08:00 |
gaoxin
|
b10dad4285
|
【法宝聚灵】背包和掉落界面不显示碎片框
|
2021-11-22 12:01:16 +08:00 |
jiaoyangna
|
047e5cbe72
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 11:46:56 +08:00 |
jiaoyangna
|
0d073eb323
|
属性界面修改提交i
|
2021-11-22 11:44:48 +08:00 |
gaoxin
|
3aa09bfbeb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 11:18:43 +08:00 |
gaoxin
|
f78031984a
|
【背包】法宝聚灵页签添加
|
2021-11-22 11:18:28 +08:00 |
jiaoyangna
|
04ff9d99e4
|
碎片自选箱修改提交
|
2021-11-22 11:16:18 +08:00 |
jiaoyangna
|
e61de063cf
|
法宝聚灵修改提交
|
2021-11-22 11:01:43 +08:00 |
jiaoyangna
|
7074527619
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 10:39:10 +08:00 |
jiaoyangna
|
cefbc9b8dc
|
属性加成错误显示修改
|
2021-11-22 10:38:54 +08:00 |
wangzhenxing
|
f10d6ee2a1
|
[玉虚论道]======保存队伍时添加相同英雄检测
|
2021-11-22 10:18:39 +08:00 |
jiaoyangna
|
5684d23328
|
红点修改
|
2021-11-19 18:54:16 +08:00 |
jiaoyangna
|
e722bf90d4
|
属性显示错误修改提交
|
2021-11-19 18:51:18 +08:00 |
jiaoyangna
|
18968609a6
|
属性显示错误修改
|
2021-11-19 18:49:52 +08:00 |
jiaoyangna
|
ff71fb378e
|
属性显示错误修改
|
2021-11-19 18:48:18 +08:00 |
jiaoyangna
|
1b11728534
|
道具点击报错修改提交
|
2021-11-19 18:39:04 +08:00 |
jiaoyangna
|
2978dc203c
|
添加特效,添加点击事件
|
2021-11-19 18:32:22 +08:00 |
jiaoyangna
|
71fb3c9bc3
|
协议提交
|
2021-11-19 18:05:20 +08:00 |
jiaoyangna
|
db0fcea43e
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# 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/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-19 18:01:59 +08:00 |
ZhangBiao
|
85c8028bc5
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-19 17:57:09 +08:00 |
ZhangBiao
|
f1737b1c5d
|
【灵脉秘境】提交
|
2021-11-19 17:48:56 +08:00 |
wangzhenxing
|
2cf0c5afde
|
[战斗]=======被动310,391修改
|
2021-11-19 17:39:43 +08:00 |
gaoxin
|
d95530acc6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-19 17:29:45 +08:00 |
gaoxin
|
9ce1d26fa9
|
【战斗】添加一些战斗类型
|
2021-11-19 17:29:40 +08:00 |
jiaoyangna
|
91dfe3131d
|
灵兽宝阁进度icon点击显示错误修改
(cherry picked from commit 2de1c704f0)
|
2021-11-19 17:29:07 +08:00 |
jiaoyangna
|
2de1c704f0
|
灵兽宝阁进度icon点击显示错误修改
|
2021-11-19 17:28:20 +08:00 |
ZhangBiao
|
95f71667fe
|
【灵脉秘境】提交
|
2021-11-19 17:23:06 +08:00 |
gaoxin
|
ab9408b485
|
【战斗】后端被动和主动技能id格式转换成数字,可能导致战斗不一致
|
2021-11-19 17:21:01 +08:00 |
jiaoyangna
|
467dd1aebb
|
添加特效提交
|
2021-11-19 17:08:14 +08:00 |
ZhangBiao
|
9f356783e1
|
【灵脉秘境】提交
|
2021-11-19 17:01:10 +08:00 |
jiaoyangna
|
bc62311af9
|
法宝之魂第二个界面提交
|
2021-11-19 16:52:15 +08:00 |
ZhangBiao
|
5e09e0b9a3
|
【灵脉秘境】切磋
|
2021-11-19 16:16:45 +08:00 |
ZhangBiao
|
c8d4cadb2b
|
【灵脉秘境】提交
|
2021-11-19 15:38:41 +08:00 |
jiaoyangna
|
b08dde6851
|
报错修改提交
|
2021-11-19 14:39:20 +08:00 |
jiaoyangna
|
d69b3c8ca5
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-11-19 14:35:42 +08:00 |
ZhangBiao
|
c9e465f662
|
【灵脉秘境】提交
|
2021-11-19 11:45:53 +08:00 |
jiaoyangna
|
808dcddc62
|
法宝聚灵界面1提交
|
2021-11-19 11:33:34 +08:00 |
wangzhenxing
|
3d4211740c
|
【战斗表现】=========我方战中立绘缩放读取字段修改
|
2021-11-19 11:19:18 +08:00 |
wangzhenxing
|
9830c04a4b
|
【战斗】======御甲增加表现
|
2021-11-19 11:18:15 +08:00 |
wangzhenxing
|
fc82b7bbc7
|
【战斗】======323 258 112 被动修改
|
2021-11-19 10:00:04 +08:00 |
ZhangBiao
|
9e507326fd
|
【灵脉秘境】提交
|
2021-11-19 09:38:41 +08:00 |
ZhangBiao
|
6454e84172
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 19:07:50 +08:00 |
ZhangBiao
|
fc704b98c3
|
【灵脉秘境】资源提交
|
2021-11-18 19:07:19 +08:00 |
ZhangBiao
|
c994c9e636
|
【灵脉秘境】提交
|
2021-11-18 18:43:22 +08:00 |
wangzhenxing
|
45bc2139a6
|
[战斗表现]=========我方前排血条位置修改
|
2021-11-18 18:37:14 +08:00 |
wangzhenxing
|
b74561d70b
|
[战斗表现]===============敌我前后排立绘缩放大小固定
|
2021-11-18 18:29:13 +08:00 |
gaoxin
|
670320141c
|
【战斗】初始怒气和爆伤减免的顺序交换
|
2021-11-18 17:17:53 +08:00 |
ZhangBiao
|
7d0a24a3cc
|
【灵脉秘境】提交
|
2021-11-18 17:15:16 +08:00 |
gaoxin
|
cd291429f1
|
【坐骑碎片合成】删除无用代码
|
2021-11-18 16:05:26 +08:00 |
gaoxin
|
77c3376d82
|
【坐骑碎片合成】
|
2021-11-18 16:03:34 +08:00 |
wangzhenxing
|
e705049135
|
【战斗】=======362修改 填加388-391被动
|
2021-11-18 16:02:16 +08:00 |
ZhangBiao
|
015341b7a6
|
【灵脉秘境】提交
|
2021-11-18 15:49:39 +08:00 |
ZhangBiao
|
f79de8970c
|
【灵脉秘境】提交
|
2021-11-18 15:45:21 +08:00 |
wangzhenxing
|
ad0e844852
|
[战中表现]========我方单位立绘大小读取字段修改
|
2021-11-18 15:44:16 +08:00 |
jiaoyangna
|
efe7866916
|
身外化身添加属性显示
|
2021-11-18 15:39:00 +08:00 |
ZhangBiao
|
58d7a71faf
|
【灵脉秘境】提交
|
2021-11-18 15:14:39 +08:00 |
ZhangBiao
|
a2a5d0f192
|
【灵脉秘境】提交
|
2021-11-18 14:39:50 +08:00 |
ZhangBiao
|
7f0720554f
|
【灵脉秘境】提交
|
2021-11-18 14:31:57 +08:00 |
gaoxin
|
f5f2e9c7ef
|
【账号校验】大小写修改
|
2021-11-18 14:20:03 +08:00 |
ZhangBiao
|
79d2113bc2
|
【灵脉秘境】提交
|
2021-11-18 14:10:57 +08:00 |
ZhangBiao
|
de7a516a87
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 13:30:03 +08:00 |
ZhangBiao
|
0722edb107
|
【灵脉秘境】提交
|
2021-11-18 13:29:26 +08:00 |
ZhangBiao
|
8125ed131e
|
【灵脉秘境】提交
|
2021-11-18 13:17:28 +08:00 |
jiaoyangna
|
4d887421ea
|
身外化身提交
|
2021-11-18 11:55:26 +08:00 |
ZhangBiao
|
03cdea5c83
|
【灵脉秘境】纪录提交
|
2021-11-18 11:35:20 +08:00 |
gaoxin
|
3565dc2b2a
|
【改名时上报事件】
|
2021-11-18 11:34:54 +08:00 |
wangzhenxing
|
666f33e9c9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-18 11:08:11 +08:00 |
wangzhenxing
|
071b7e62de
|
[战斗]======被动362 修改
|
2021-11-18 11:06:19 +08:00 |
gaoxin
|
ecedea90f8
|
Merge branch '0功能/新增克制属性' into china/dev
|
2021-11-18 10:49:34 +08:00 |
ZhangBiao
|
e174e24bc1
|
【灵脉秘境】提交
|
2021-11-18 10:26:14 +08:00 |
ZhangBiao
|
790fe1c88f
|
【灵脉秘境】提交
|
2021-11-17 18:28:59 +08:00 |
jiaoyangna
|
c62b30d9cb
|
属性展示错误修改
|
2021-11-17 17:58:02 +08:00 |
wangzhenxing
|
bf5f664fb8
|
[战斗]==========困难副本 禁疗不算控制
|
2021-11-17 17:36:20 +08:00 |
gaoxin
|
37000619e3
|
【战斗】加入克制属性的计算
|
2021-11-17 17:29:46 +08:00 |
wangzhenxing
|
6ee80e7a9f
|
[战斗表现]================战斗表现修改提交
|
2021-11-17 17:29:17 +08:00 |
ZhangBiao
|
f2298b3b3e
|
【灵脉秘境】提价o
|
2021-11-17 17:24:51 +08:00 |
gaoxin
|
1aa2efc1b1
|
【装备信息】基础属性,属性多关闭打开属性少的,显示属性错误
|
2021-11-17 16:58:06 +08:00 |
gaoxin
|
b1954f543f
|
【装备信息】基础属性,属性多关闭打开属性少的,显示属性错误
|
2021-11-17 16:57:29 +08:00 |
gaoxin
|
8bb710452c
|
【战斗力】装备战斗力计算方式修改
|
2021-11-17 16:50:16 +08:00 |
ZhangBiao
|
2b2a77a129
|
【灵脉秘境】提交
|
2021-11-17 16:14:47 +08:00 |
gaoxin
|
fe13249728
|
【人物属性】新增爆伤减免属性,战斗适用
|
2021-11-17 16:01:14 +08:00 |
gaoxin
|
12fe3eb3e4
|
【战斗力】公式参数走表,装备,法宝战斗力计算公式修改
|
2021-11-17 15:55:37 +08:00 |
wangzhenxing
|
1362e8b4f6
|
[战斗]=============第三批神魂技能提交
|
2021-11-17 15:01:24 +08:00 |
ZhangBiao
|
b6ce191bff
|
【装备界面】无法卸下调整
|
2021-11-17 12:34:39 +08:00 |
ZhangBiao
|
0a7d343e20
|
【灵脉】提交
|
2021-11-17 11:12:49 +08:00 |
jiaoyangna
|
2911c5b77c
|
乾坤宝囊限时商店修改提交
(cherry picked from commit e8df9ca87e)
|
2021-11-17 10:36:57 +08:00 |
jiaoyangna
|
e8df9ca87e
|
乾坤宝囊限时商店修改提交
|
2021-11-17 10:36:24 +08:00 |
ZhangBiao
|
d8dd88b2e2
|
【灵脉秘境】提交
|
2021-11-16 18:30:08 +08:00 |
ZhangBiao
|
6012b533ca
|
【灵脉秘境】提交
|
2021-11-16 17:34:37 +08:00 |
jiaoyangna
|
ec48fa55f0
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-11-16 17:34:22 +08:00 |
jiaoyangna
|
cd5c2f585a
|
【ID1019160】
【神将】初始4星情报界面有魂印图标,点击提示6星解锁
(cherry picked from commit ee46920fe5)
|
2021-11-16 17:17:35 +08:00 |
jiaoyangna
|
ee46920fe5
|
【ID1019160】
【神将】初始4星情报界面有魂印图标,点击提示6星解锁
|
2021-11-16 17:17:00 +08:00 |
gaoxin
|
0a924855ed
|
【账号ID校验】添加
|
2021-11-16 17:01:09 +08:00 |
jiaoyangna
|
e3db539691
|
【ID1019147】
【寻宝】神魂等级效果在寻宝详情界面穿透
(cherry picked from commit 3921d6326f)
|
2021-11-16 17:00:00 +08:00 |
gaoxin
|
ce5042eb86
|
【克制属性】添加
|
2021-11-16 16:59:59 +08:00 |
jiaoyangna
|
3921d6326f
|
【ID1019147】
【寻宝】神魂等级效果在寻宝详情界面穿透
|
2021-11-16 16:59:30 +08:00 |
jiaoyangna
|
2ec40af5e5
|
【ID1019177】
【鸿蒙阵】共鸣区上阵激活神魂将,下拉必现
(cherry picked from commit 7f5a36cf4b)
|
2021-11-16 16:29:16 +08:00 |
jiaoyangna
|
7f5a36cf4b
|
【ID1019177】
【鸿蒙阵】共鸣区上阵激活神魂将,下拉必现
|
2021-11-16 16:28:36 +08:00 |
jiaoyangna
|
1e4a7a57be
|
法宝之魂 提交
|
2021-11-16 15:24:17 +08:00 |
ZhangBiao
|
ec1d668524
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-16 13:11:47 +08:00 |
ZhangBiao
|
5eaf88defb
|
【GM】修改GM
|
2021-11-16 11:53:19 +08:00 |
ZhangBiao
|
d717519d93
|
【灵脉秘境】提交
|
2021-11-16 11:21:37 +08:00 |
jiaoyangna
|
aa6a031fdf
|
法宝聚灵提交
|
2021-11-16 09:33:10 +08:00 |
ZhangBiao
|
a4151f51b2
|
【灵脉秘境】提交
|
2021-11-15 18:38:53 +08:00 |
gaoxin
|
b6ea250096
|
【新手战斗】选择女角色后,战斗中立绘替换为女角色
|
2021-11-15 18:34:25 +08:00 |
jiaoyangna
|
e6f4e50656
|
法宝聚灵
|
2021-11-15 18:24:39 +08:00 |
gaoxin
|
3a70720f9c
|
【新手战斗】第一场战斗关闭跳过
|
2021-11-15 17:26:04 +08:00 |
liujiaqi
|
1498cd7661
|
【新手战斗】报错修复
|
2021-11-19 17:20:28 +08:00 |
ZhangBiao
|
336ea6b8d3
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-15 17:19:01 +08:00 |
gaoxin
|
79d22b0545
|
【新手战斗】回合开始触发改为回合结束触发
|
2021-11-15 17:09:52 +08:00 |
ZhangBiao
|
254a420fb7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-15 16:59:01 +08:00 |
ZhangBiao
|
2c0032b829
|
【神魂】头像框错误修改
|
2021-11-15 16:58:49 +08:00 |
gaoxin
|
9c50acee09
|
【引导战斗】添加第N回合开始时触发剧情
|
2021-11-15 16:46:41 +08:00 |
ZhangBiao
|
d815fbb69f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-15 16:44:59 +08:00 |
ZhangBiao
|
b7c354befe
|
【神魂】神魂头像框修改
|
2021-11-15 16:44:46 +08:00 |
gaoxin
|
f7a1ddbc94
|
【假战斗】背景走表配置
|
2021-11-15 16:39:38 +08:00 |
ZhangBiao
|
9fca63f5a1
|
【成长基金】配合后端修改
|
2021-11-15 15:44:02 +08:00 |
gaoxin
|
1e5f397ac1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-15 13:11:18 +08:00 |
gaoxin
|
5be38dacb1
|
【新手剧情】起名界面添加回调
|
2021-11-15 13:10:59 +08:00 |
wangzhenxing
|
7790f90d8f
|
【战斗】=======被动处理伤害修改
|
2021-11-15 10:34:13 +08:00 |
ZhangBiao
|
ff3fcf3db9
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-15 09:56:59 +08:00 |
ZhangBiao
|
07a87548aa
|
【灵脉秘境】提交
|
2021-11-15 09:56:02 +08:00 |
gaoxin
|
f1f407fdd6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-12 18:19:01 +08:00 |
gaoxin
|
ee6e1265d8
|
【活动】修复红点会显示灰色的问题
|
2021-11-12 18:18:56 +08:00 |
gaoxin
|
6033aa6128
|
【战斗力】修复条件属性计算不完全的问题
|
2021-11-12 18:18:50 +08:00 |
wangzhenxing
|
7dfa28321c
|
[战斗]======被动376 377修改
|
2021-11-12 17:38:28 +08:00 |
gaoxin
|
83583747ad
|
Merge branch '0功能/和谐资源后台控制' into china/dev
|
2021-11-12 16:39:53 +08:00 |
skuld
|
b63ad78128
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-28 16:30:29 +08:00 |
skuld
|
9f64c64712
|
【森罗环境】商店无法拖动修改
|
2021-11-28 16:30:11 +08:00 |
gaoxin
|
69f0ebc6d0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-12 15:56:04 +08:00 |
gaoxin
|
93640449f3
|
【引导】副本前引导添加
|
2021-11-12 15:55:53 +08:00 |
wangzhenxing
|
41dc490d28
|
【战斗】=============== 被动处理伤害方法只处理减伤
|
2021-11-12 15:54:54 +08:00 |
jiaoyangna
|
075de29090
|
编队界面看神将情报错误修改
(cherry picked from commit c8e7d0cdd4)
|
2021-11-12 15:52:09 +08:00 |
jiaoyangna
|
c8e7d0cdd4
|
编队界面看神将情报错误修改
|
2021-11-12 15:51:26 +08:00 |
wangzhenxing
|
4756c0b19e
|
[战斗]========363被动替换逻辑修改
|
2021-11-12 15:31:01 +08:00 |
gaoxin
|
1d22b10e61
|
【引导】通过关卡时引导添加
|
2021-11-12 14:52:30 +08:00 |
gaoxin
|
9f2507879b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-12 11:59:46 +08:00 |
gaoxin
|
451d8f4460
|
【战斗】伤害数字延时显示
|
2021-11-12 11:59:40 +08:00 |
jiaoyangna
|
aedad781aa
|
灵兽宝阁展示概率错误修改
|
2021-11-12 11:30:04 +08:00 |
jiaoyangna
|
021b0e03be
|
魂灵宝界面修改提交
|
2021-11-12 11:26:02 +08:00 |
jiaoyangna
|
bbb1c8e1a6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-12 11:14:39 +08:00 |
jiaoyangna
|
63b1f6456e
|
魂灵宝界面修改提交
|
2021-11-12 11:14:26 +08:00 |
gaoxin
|
c00a3b603e
|
【Vip】修复等级奖励刷新不及时的问题
|
2021-11-12 10:07:44 +08:00 |
jiaoyangna
|
9a261f5c13
|
法宝界面文字大小修改
|
2021-11-12 09:55:00 +08:00 |
jiaoyangna
|
a82622585e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-12 09:40:25 +08:00 |
jiaoyangna
|
6ed696b426
|
法宝界面文字大小修改
|
2021-11-12 09:40:13 +08:00 |
ZhangBiao
|
36f24a4d3c
|
【魂印界面】界面背景颜色随物品品质更改
|
2021-11-11 17:58:40 +08:00 |
ZhangBiao
|
e2526cfce1
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-11 17:54:29 +08:00 |
ZhangBiao
|
c5a7206184
|
【灵脉秘境】提交
|
2021-11-11 17:53:47 +08:00 |
jiaoyangna
|
89cf7cacfe
|
灵兽宝阁 假战斗报错修改
|
2021-11-11 17:36:53 +08:00 |
jiaoyangna
|
8c9e1b7a2f
|
脚本初提
|
2021-11-11 16:48:15 +08:00 |
ZhangBiao
|
8818b463ae
|
【灵脉秘境】提交
|
2021-11-11 16:36:52 +08:00 |
jiaoyangna
|
a3f8c8aee9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 16:07:47 +08:00 |
jiaoyangna
|
6e294df15a
|
删除log
|
2021-11-11 16:07:33 +08:00 |
ZhangBiao
|
745cb6450c
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-11 15:09:24 +08:00 |
ZhangBiao
|
c37386fada
|
【优化】轩辕宝境界面优化
|
2021-11-11 14:59:15 +08:00 |
ZhangBiao
|
0769659e72
|
【优化】云游商人增加白金装备分解配方
|
2021-11-11 14:48:50 +08:00 |
ZhangBiao
|
d0b2bdd412
|
【灵脉秘境】提交
|
2021-11-11 14:28:02 +08:00 |
gaoxin
|
436de6bf4f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 14:10:53 +08:00 |
gaoxin
|
3addb9905b
|
【神将觉醒】觉醒成功界面中,不需要显示非核心天赋的变化(非特性天赋),且【特性】文字需要放大
|
2021-11-11 14:10:48 +08:00 |
wangzhenxing
|
f71bbbdf95
|
[战斗]===========第二期神魂被动提交
|
2021-11-11 14:01:32 +08:00 |
gaoxin
|
c259e72874
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 13:49:23 +08:00 |
gaoxin
|
4ef85b5720
|
【【通关奖励】创建新号首次进入通关奖励,通关简单3-10的英雄碎片缺少数量显示,退出该界面在进入数量才显示出来】https://www.tapd.cn/33029060/bugtrace/bugs/view?bug_id=1133029060001019080
|
2021-11-11 13:49:10 +08:00 |
jiaoyangna
|
390d514bd9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 13:41:59 +08:00 |
jiaoyangna
|
4455242293
|
【ID1019110】
【神魂图鉴】图鉴中的神魂弹窗,神将头像不是边框边框
|
2021-11-11 13:41:42 +08:00 |
gaoxin
|
ecbee47ef8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 12:00:39 +08:00 |
gaoxin
|
5d266a04d9
|
【引导】添加剧情节点
|
2021-11-11 12:00:34 +08:00 |
ZhangBiao
|
db15950d6a
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-11 10:56:10 +08:00 |
jiaoyangna
|
d37ed44478
|
【ID1010636】
【优化】灵兽宝阁活动调整
|
2021-11-11 10:52:15 +08:00 |
jiaoyangna
|
56ba9ccba8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-11 10:49:14 +08:00 |
jiaoyangna
|
d1cb61fc18
|
【ID1010636】
【优化】灵兽宝阁活动调整
|
2021-11-11 10:48:59 +08:00 |
ZhangBiao
|
3eca9bec47
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-11 10:11:04 +08:00 |
gaoxin
|
f4ff8d4d77
|
【登录】非sdk登录时,不重新输入账号不可以再进入游戏
|
2021-11-11 10:07:14 +08:00 |
ZhangBiao
|
c104bd65a7
|
【灵脉秘境】提交
|
2021-11-11 10:06:49 +08:00 |
jiaoyangna
|
bdb08206df
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 18:35:53 +08:00 |
jiaoyangna
|
ceb7ee3602
|
【ID1010636】
【优化】灵兽宝阁活动调整
|
2021-11-10 18:35:38 +08:00 |
gaoxin
|
f46aac739e
|
【三界降魔】修复没有坐骑时报错得问题
|
2021-11-10 17:31:38 +08:00 |
gaoxin
|
a78b4996dd
|
【抽卡】尝试修复报错黑屏
|
2021-11-10 16:57:44 +08:00 |
ZhangBiao
|
6d483802fa
|
【修行】特效穿透修改
(cherry picked from commit ee7b2b9919)
|
2021-11-10 15:22:43 +08:00 |
ZhangBiao
|
ee7b2b9919
|
【修行】特效穿透修改
|
2021-11-10 15:20:18 +08:00 |
ZhangBiao
|
cc316086e9
|
【新·物品】界面提交
|
2021-11-10 15:03:18 +08:00 |
ZhangBiao
|
1adee43039
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 14:54:18 +08:00 |
ZhangBiao
|
f74ce2f895
|
【新·物品】界面提交
|
2021-11-10 14:53:35 +08:00 |
jiaoyangna
|
908e068f23
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 13:24:05 +08:00 |
jiaoyangna
|
1b95b2a04a
|
公会查看成员编队神将属性错误修改
|
2021-11-10 13:23:42 +08:00 |
gaoxin
|
b661b04ad1
|
【新假战斗】修复正常战斗报错,修复加战斗中主角性别错误
|
2021-11-10 13:22:32 +08:00 |
gaoxin
|
6d377cdf69
|
【新假战斗】修改假战斗的战斗类型
|
2021-11-10 11:42:20 +08:00 |
gaoxin
|
880c77888a
|
【新假战斗】加入主角技能
|
2021-11-10 11:03:18 +08:00 |
gaoxin
|
c9e2ddcaf8
|
【新假战斗】
|
2021-11-10 09:48:42 +08:00 |
ZhangBiao
|
7efdfd5029
|
【新·装备】增加战力对比图标
|
2021-11-09 18:24:38 +08:00 |
ZhangBiao
|
c627c5cd28
|
【新·魂灵宝】增加战力对比图片
|
2021-11-09 17:35:27 +08:00 |
ZhangBiao
|
aa9cc34792
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-09 17:06:59 +08:00 |
ZhangBiao
|
f18880622e
|
【新·魂灵宝】提交
|
2021-11-09 17:06:47 +08:00 |
gaoxin
|
f23a455797
|
【魂印】详情界面优化
|
2021-11-09 15:48:56 +08:00 |
ZhangBiao
|
79f6f739ad
|
【天枢密卷】魂印文字过长修改
|
2021-11-09 14:44:39 +08:00 |
ZhangBiao
|
76c3c5c0bf
|
【新·魂灵宝】提交
|
2021-11-09 14:39:27 +08:00 |
ZhangBiao
|
fdffaf846e
|
【新·魂灵宝】界面提交
|
2021-11-09 11:42:19 +08:00 |
gaoxin
|
3131ffca2f
|
【资源和谐】后台控制完成
|
2021-11-09 10:49:37 +08:00 |
ZhangBiao
|
ed02f4a86f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-09 10:22:33 +08:00 |
ZhangBiao
|
12e46be512
|
【装备界面】提交
|
2021-11-09 10:22:16 +08:00 |
jiaoyangna
|
922c55e7e7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 17:23:07 +08:00 |
jiaoyangna
|
173221dd1a
|
【ID1010656】
【商店优化】魂印商店中,玩家尚未获得过的魂印上添加“新”标志
|
2021-11-08 17:22:51 +08:00 |
gaoxin
|
0595ecbb46
|
【七界试炼】添加战斗结果校验
|
2021-11-08 17:04:22 +08:00 |
jiaoyangna
|
a68330c17f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 16:31:48 +08:00 |
jiaoyangna
|
419a9cedc9
|
森罗幻境神将修改
|
2021-11-08 16:31:34 +08:00 |
ZhangBiao
|
363839c48a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 16:00:06 +08:00 |
ZhangBiao
|
76b7b5caca
|
【log】提交
|
2021-11-08 15:59:56 +08:00 |
gaoxin
|
1aa36e8ac1
|
【和谐】孟姜女加入和谐资源配置
|
2021-11-08 15:29:23 +08:00 |
wangzhenxing
|
d30fc43d9f
|
【战斗】============被动285修改
|
2021-11-08 15:28:04 +08:00 |
jiaoyangna
|
8bbdf8eed5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 15:18:45 +08:00 |
jiaoyangna
|
265aaca235
|
神将界面特效修改提交
|
2021-11-08 15:18:28 +08:00 |
gaoxin
|
fe99284efe
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 15:12:59 +08:00 |
gaoxin
|
5f0dc622a5
|
【皮肤】背包内解锁孙悟空皮肤,弹出是否前往穿戴,点击前往,跳转到神将传说界面
|
2021-11-08 15:12:48 +08:00 |
jiaoyangna
|
dc5f09cc02
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 15:05:27 +08:00 |
jiaoyangna
|
e457260b42
|
神将排序界面修改提交
|
2021-11-08 15:04:53 +08:00 |
gaoxin
|
fc38e204ce
|
【森罗幻境】森罗幻境神魂特效穿透
|
2021-11-08 15:04:36 +08:00 |
gaoxin
|
3dffd71924
|
【跨服战】优化打开跨服战界面,请求过多导致界面不可点击的问题
|
2021-11-08 14:49:26 +08:00 |
gaoxin
|
bbb89af48e
|
【英雄突破】白骨精升级到100级点击突破按钮,弹出跳转提示,点击前往进阶界面报错
|
2021-11-08 14:10:26 +08:00 |
wangzhenxing
|
e99f8c285f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 14:02:57 +08:00 |
wangzhenxing
|
95b7fceb34
|
[神魂]======神魂升级后技能描述修改
|
2021-11-08 14:02:33 +08:00 |
gaoxin
|
67f3ca9f52
|
【适配】1080*2550,进阶白骨精法宝,文字描述遮挡
|
2021-11-08 13:39:29 +08:00 |
ZhangBiao
|
a577d80d76
|
【神魂】增加特效
|
2021-11-08 13:02:00 +08:00 |
jiaoyangna
|
c490e9c01c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 11:24:36 +08:00 |
jiaoyangna
|
1329112387
|
神魂未激活图片修改提交
|
2021-11-08 11:24:10 +08:00 |
gaoxin
|
82dd1b6512
|
【我要变强】切换页签报错
|
2021-11-08 11:20:30 +08:00 |
ZhangBiao
|
0fc2ec5b08
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 11:07:35 +08:00 |
ZhangBiao
|
2621f0f9f8
|
【升星有礼】白骨精进阶10星,获得的展示界面没有天赋详情
|
2021-11-08 11:07:11 +08:00 |
jiaoyangna
|
67c6e7d92d
|
玉虚论道编队修改
|
2021-11-08 11:06:57 +08:00 |
jiaoyangna
|
024b684999
|
排行榜神魂放大镜显示错误修改
|
2021-11-08 10:51:51 +08:00 |
jiaoyangna
|
e8433d1026
|
玉虚论道记录神魂修改提交,神将界面修改提交
|
2021-11-08 10:30:12 +08:00 |
jiaoyangna
|
cb41ba3991
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-08 10:20:34 +08:00 |
jiaoyangna
|
9fe5c809b8
|
灵兽界面技能描述白片修改提交
|
2021-11-08 10:20:19 +08:00 |
wangzhenxing
|
8bc936aff8
|
【神魂】=====伤害统计界面神魂显示修改
|
2021-11-05 18:24:05 +08:00 |
ZhangBiao
|
637defb9e2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 18:14:57 +08:00 |
ZhangBiao
|
a953a78018
|
【升星有礼】觉醒后没有红点修改
|
2021-11-05 18:14:44 +08:00 |
gaoxin
|
d4582cf244
|
【神魂】修复战斗中神魂特效不显示的问题
|
2021-11-05 18:13:32 +08:00 |
ZhangBiao
|
3418bac21d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 18:09:46 +08:00 |
ZhangBiao
|
104f5cbda8
|
【降妖夺宝】修改提交
|
2021-11-05 18:09:14 +08:00 |
jiaoyangna
|
5cb5137fde
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 17:38:24 +08:00 |
jiaoyangna
|
afcfc1b393
|
神魂星星修改提交
|
2021-11-05 17:38:10 +08:00 |
wangzhenxing
|
99452354bc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 17:21:30 +08:00 |
wangzhenxing
|
a92a76e3ab
|
【神魂】=====技能描述修改
|
2021-11-05 17:21:18 +08:00 |
jiaoyangna
|
2aea503619
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 17:14:08 +08:00 |
jiaoyangna
|
bd8cd97bf3
|
神魂星星修改提交
|
2021-11-05 17:13:49 +08:00 |
gaoxin
|
89957b0787
|
【坐骑、称号属性】需要在背包激活时就加属性,而不是必须要佩戴一次
|
2021-11-05 17:12:35 +08:00 |
gaoxin
|
0408157db2
|
【坐骑】狐狸坐骑在三界除魔榜上位置不居中
|
2021-11-05 17:00:28 +08:00 |
ZhangBiao
|
142956ca6a
|
【活动】活动修改提交
|
2021-11-05 16:43:09 +08:00 |
jiaoyangna
|
ad3b903209
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 16:20:01 +08:00 |
jiaoyangna
|
2179a76560
|
森罗幻境,公会星星修改提交
|
2021-11-05 16:19:47 +08:00 |
ZhangBiao
|
60391c16b4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 15:51:05 +08:00 |
ZhangBiao
|
ea4661b254
|
【无尽副本】修改
|
2021-11-05 15:50:49 +08:00 |
jiaoyangna
|
1c2758f26c
|
送神祠星级修改
|
2021-11-05 15:48:22 +08:00 |
jiaoyangna
|
f8b43c4c30
|
修行星星修改提交
|
2021-11-05 15:23:21 +08:00 |
jiaoyangna
|
057ec06b4c
|
协议修改提交
|
2021-11-05 15:14:00 +08:00 |
jiaoyangna
|
0bd44642dc
|
战斗结算界面星级修改
|
2021-11-05 14:44:10 +08:00 |
jiaoyangna
|
420356da83
|
添加特效
|
2021-11-05 14:33:09 +08:00 |
jiaoyangna
|
e35ded2b5d
|
巅峰赛星级修改提交
|
2021-11-05 14:08:35 +08:00 |
jiaoyangna
|
42bb1c7443
|
四灵试炼修改提交
|
2021-11-05 13:59:19 +08:00 |
jiaoyangna
|
9d1e517743
|
四灵试炼层级报错修改
|
2021-11-05 13:53:56 +08:00 |
jiaoyangna
|
2985079325
|
编队星星修改提交
|
2021-11-05 13:37:29 +08:00 |
jiaoyangna
|
cdd6baeb5f
|
巅峰赛星星修改提交
|
2021-11-05 13:35:14 +08:00 |
jiaoyangna
|
29e279755e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 13:21:39 +08:00 |
jiaoyangna
|
d0d93e02ea
|
代码星星层级设置修改
|
2021-11-05 13:18:55 +08:00 |
wangzhenxing
|
6ace7b50ab
|
[战斗]======被动154 200 360 修改
|
2021-11-05 13:17:17 +08:00 |
jiaoyangna
|
23ebadf81c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 11:52:40 +08:00 |
jiaoyangna
|
a4ab833366
|
星星位置还原
|
2021-11-05 11:52:14 +08:00 |
ZhangBiao
|
a4fa877f6b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 11:41:03 +08:00 |
ZhangBiao
|
56530dbc93
|
【无尽副本】提交
|
2021-11-05 11:40:48 +08:00 |
jiaoyangna
|
8378ea7966
|
星星位置修改提交
|
2021-11-05 11:39:55 +08:00 |
gaoxin
|
2f65f4d391
|
【心魔试炼】界面报错修复
|
2021-11-05 11:06:10 +08:00 |
jiaoyangna
|
b78131766d
|
鸿蒙阵报错修改提交
|
2021-11-05 10:56:42 +08:00 |
jiaoyangna
|
ccedbd3867
|
星星修改提交
|
2021-11-05 10:53:07 +08:00 |
jiaoyangna
|
2774ca08b1
|
玉虚论道编队报错修改提交
|
2021-11-05 10:42:37 +08:00 |
jiaoyangna
|
568d9ddfc7
|
星星报错修改提交
|
2021-11-05 10:39:22 +08:00 |
jiaoyangna
|
59c6112306
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:29:43 +08:00 |
jiaoyangna
|
09137cb6a3
|
星星数量修改
|
2021-11-05 10:29:13 +08:00 |
ZhangBiao
|
43a8da3f2f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:25:08 +08:00 |
ZhangBiao
|
7f258a4aa2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:24:44 +08:00 |
jiaoyangna
|
8fd4b5e367
|
神魂提交
|
2021-11-05 10:24:41 +08:00 |
ZhangBiao
|
005ac1e5df
|
【光效穿透】编队界面上阵觉醒神将,长按神将打开神将情报,觉醒光效穿透
|
2021-11-05 10:24:32 +08:00 |
jiaoyangna
|
5ac1f04718
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:18:28 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +08:00 |
wangzhenxing
|
c04ee81117
|
【玉虚论道】======战斗信息界面报错修改提交
|
2021-11-05 10:17:45 +08:00 |