ZhangBiao
|
025edbcacf
|
【灵脉秘境】界面修改、红点修改
|
2021-11-22 14:13:49 +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 |