jiaoyangna
|
d4d9b88fe7
|
神魂修改提交
|
2021-10-27 15:24:46 +08:00 |
jiaoyangna
|
d398c21668
|
神魂提交
|
2021-10-27 12:50:15 +08:00 |
jiaoyangna
|
edcdd0e81e
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-26 16:01:24 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
jiaoyangna
|
bdff69b0e2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-26 15:29:04 +08:00 |
jiaoyangna
|
41966a1487
|
逍遥游报错修改提交
|
2021-10-26 15:28:44 +08:00 |
gaoxin
|
e7da10a595
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-26 14:45:34 +08:00 |
gaoxin
|
a692f8d9d4
|
【本场最佳】主角名颜色根据修行等级改变
|
2021-10-26 14:45:28 +08:00 |
jiaoyangna
|
b6475fb1b1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-26 14:17:56 +08:00 |
jiaoyangna
|
3d832f81cf
|
【ID1010556】
【优化】好感度解锁等级优化
|
2021-10-26 14:17:07 +08:00 |
wangzhenxing
|
4c292035cf
|
[主角技能]======心魔试炼快速战斗不显示主角伤害记录修改
|
2021-10-26 14:00:23 +08:00 |
ZhangBiao
|
ccd2b2ffd7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-26 10:13:41 +08:00 |
ZhangBiao
|
cce7591927
|
【山河社稷图】小关卡单独上阵报错修改
|
2021-10-26 10:13:28 +08:00 |
gaoxin
|
7ac3b1bc14
|
【飘渺之旅】修复完成全部任务,无法领取的问题
|
2021-10-25 19:22:57 +08:00 |
ZhangBiao
|
f51c80b277
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-25 18:40:33 +08:00 |
ZhangBiao
|
7332c761b8
|
【御剑行】错别字
|
2021-10-25 18:40:22 +08:00 |
gaoxin
|
8fdb8942e1
|
【飘渺之旅】修复第一天显示了重复的任务的问题
|
2021-10-25 18:15:48 +08:00 |
wangzhenxing
|
fbf66138ca
|
[玉虚论道]======玉虚段位奖励界面特效层级修改提交
|
2021-10-25 17:19:01 +08:00 |
ZhangBiao
|
9c76f42161
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-25 16:47:15 +08:00 |
ZhangBiao
|
e8f0a9b4a1
|
【御剑行】界面黑屏倒计时结束后弹出排行榜
|
2021-10-25 16:46:51 +08:00 |
wangzhenxing
|
7b406e1c4b
|
【战斗】===========主角技能使用 队伍战斗力 接口修改
|
2021-10-25 16:37:41 +08:00 |
gaoxin
|
04a1196586
|
【战斗力】一旦战斗力改变就让后端重新计算战斗力
|
2021-10-25 16:13:48 +08:00 |
wangzhenxing
|
237767eb29
|
【战斗】=============灵兽技能 8 回合cd判断修改
|
2021-10-25 15:54:38 +08:00 |
wangzhenxing
|
09755c8d12
|
[战斗]==============测试战斗添加主角技能检测,攻击就是队伍战斗力
|
2021-10-25 13:48:48 +08:00 |
ZhangBiao
|
0cef23209c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-25 11:54:13 +08:00 |
ZhangBiao
|
7871064069
|
【修为】Tips修改
|
2021-10-25 11:54:04 +08:00 |
wangzhenxing
|
7ae770a3b0
|
[战斗]=============伤害力公式修改 防御 乘2
|
2021-10-25 11:48:54 +08:00 |
ZhangBiao
|
abd9795933
|
【百宝商会】红点提交
|
2021-10-25 11:15:27 +08:00 |
wangzhenxing
|
b7a2cee564
|
玉虚战斗记录敌方分数显示修改
|
2021-10-22 18:37:42 +08:00 |
wangzhenxing
|
d51a4292f3
|
协议提交 主角技能图标显示修改 玉虚战斗记录敌方分数修改
|
2021-10-22 18:30:09 +08:00 |
ZhangBiao
|
929de39da9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 18:16:05 +08:00 |
ZhangBiao
|
cc2cfd7a21
|
【百宝商会、御剑行】按钮一致性提交、显示修改
|
2021-10-22 18:15:55 +08:00 |
jiaoyangna
|
7ed825b4c1
|
飘渺之旅修改提交
|
2021-10-22 18:06:44 +08:00 |
wangzhenxing
|
5e541238de
|
[战斗]=============128 129 130 131 修改 添加最大限制
|
2021-10-22 17:34:15 +08:00 |
jiaoyangna
|
fa36828e1c
|
Revert "至尊降世活动结束不关闭提交"
This reverts commit 031895a9d1 .
|
2021-10-22 17:28:09 +08:00 |
jiaoyangna
|
031895a9d1
|
至尊降世活动结束不关闭提交
|
2021-10-22 17:24:41 +08:00 |
jiaoyangna
|
f7db9fc907
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 17:22:18 +08:00 |
jiaoyangna
|
73b9fad19d
|
至尊降世活动兼容提交
|
2021-10-22 17:21:31 +08:00 |
ZhangBiao
|
e821387c93
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 16:47:39 +08:00 |
gaoxin
|
c1352e0a59
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 02:52:56 +08:00 |
gaoxin
|
24ea182587
|
【最佳】加入主角伤害展示
|
2021-11-10 02:52:51 +08:00 |
gaoxin
|
3f2ce26aff
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 01:17:33 +08:00 |
gaoxin
|
99985c442d
|
【积天豪礼】红点加入主界面下拉按钮红点
|
2021-11-10 01:17:28 +08:00 |
gaoxin
|
8d8a50a0ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 01:01:09 +08:00 |
gaoxin
|
7a5f41ef46
|
【积天豪礼】分离到主城
|
2021-11-10 00:58:39 +08:00 |
gaoxin
|
8125b21af3
|
【跨服】修复七界试炼红点刷新不及时的问题
|
2021-11-10 00:56:37 +08:00 |
ZhangBiao
|
0508d1d652
|
【御剑行】跨期修改
|
2021-10-22 16:47:30 +08:00 |
jiaoyangna
|
acc912a0e7
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.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
|
2021-10-22 15:52:33 +08:00 |
jiaoyangna
|
f5dc4a20b2
|
神魂出版提交
|
2021-10-22 15:47:59 +08:00 |
ZhangBiao
|
ac6dca4805
|
【御剑行】赛季结束不可打开竞猜
|
2021-10-22 15:46:35 +08:00 |