Commit Graph

6500 Commits (15051ea6f995be890d3382725718c6eef277608e)
 

Author SHA1 Message Date
ZhangBiao e242e08b01 【名字颜色修改】 2021-05-26 17:03:42 +08:00
gaoxin 8c7a65bd5b 【挂机】修复文字残留的问题 2021-05-26 16:39:23 +08:00
wangzhenxing 5cb0cf109f 协议提交 2021-05-26 16:08:59 +08:00
wangzhenxing b7eaf9a65a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 16:03:40 +08:00
wangzhenxing d821836909 福利红包修改提交 2021-05-26 16:03:28 +08:00
zhangqiang 945ee5a968 【bug提交】 2021-05-26 15:47:29 +08:00
zhangqiang 9322a8489a 【提交】 2021-05-26 14:59:25 +08:00
jiaoyangna bb2cd6a263 无尽副本修改提交 2021-05-26 14:57:28 +08:00
ZhangBiao bc3c24c6b8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 14:44:49 +08:00
ZhangBiao f186f29646 提交 2021-05-26 14:44:22 +08:00
gaoxin c5c3672a65 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 14:16:58 +08:00
ZhangBiao 1e495ac6db Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 13:48:42 +08:00
ZhangBiao b526f58bc3 【主界面】右上角调整 2021-05-26 13:48:33 +08:00
gaoxin 739ded2b11 【sdk】删除多余的字段 2021-05-26 13:44:39 +08:00
gaoxin 7dede46133 【version】不再保存到resources路径 2021-05-26 13:43:49 +08:00
gaoxin 653d9bbd06 【meta】 2021-05-26 13:43:11 +08:00
gaoxin 0583113fb8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 13:40:30 +08:00
gaoxin 4d934cc63c 【GM】位置移动 2021-05-26 13:40:08 +08:00
jiaoyangna c95211428b Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-26 11:55:14 +08:00
ZhangBiao 51576888a2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 11:53:54 +08:00
ZhangBiao 5155b4aeb3 【主界面】提交 2021-05-26 11:53:45 +08:00
jiaoyangna e3c4ac2440 无尽副本战力修改提交 2021-05-26 11:52:32 +08:00
zhangqiang da9aeed441 【心魔试炼】提交 2021-05-26 11:48:44 +08:00
ZhangBiao 172f98c207 【修行】玩家界面预览报错修改 2021-05-26 11:28:59 +08:00
ZhangBiao d7cda43ed0 【主界面】右上伸缩条调整 2021-05-26 11:16:27 +08:00
ZhangBiao bd1417f9aa 【修行】引导包修改 2021-05-26 10:42:19 +08:00
jiaoyangna 06f4a3be80 无尽副本界面修改 2021-05-26 10:29:34 +08:00
ZhangBiao a47268aa88 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 10:16:33 +08:00
ZhangBiao f3cf294f42 【主界面】右上伸缩条首充引导调整,修行调整 2021-05-26 10:16:24 +08:00
zhangqiang f8ddf0fbe6 【心魔试炼】提交 2021-05-26 10:00:30 +08:00
jiaoyangna 5ae6e53b49 士气等级提升图片提交 2021-05-26 09:59:28 +08:00
zhangqiang 281e19ad74 【心魔试炼】一键 2021-05-26 09:53:41 +08:00
jiaoyangna 911f443e40 添加属性提升 2021-05-26 09:51:41 +08:00
jiaoyangna 3846170f2d 属性提升界面修改提交 2021-05-25 21:40:41 +08:00
jiaoyangna 82787b2331 无尽编队修改 2021-05-25 21:27:38 +08:00
ZhangBiao f38620058c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 21:09:43 +08:00
ZhangBiao 9e6dc29cb9 【主界面】右上伸缩条红点 2021-05-25 21:08:48 +08:00
zhangqiang 7353ddd09a 【心魔试炼】一键购买 2021-05-25 21:04:58 +08:00
zhangqiang fcc00ee1d7 【心魔试炼】提交 2021-05-25 20:50:23 +08:00
ZhangBiao 8d4d1aa777 【修行】第二短引导 2021-05-25 20:39:37 +08:00
jiaoyangna da6dd0283c 编队修改提交 2021-05-25 20:37:12 +08:00
ZhangBiao d835687e8c 【主城】伸缩条调整 2021-05-25 18:33:26 +08:00
ZhangBiao d41ba9f65d 【主城】右侧伸缩条 2021-05-25 18:21:52 +08:00
jiaoyangna a112127db0 无尽副本修改提交 2021-05-25 18:07:53 +08:00
jiaoyangna 5fb2aa23ce 无尽副本修改提交 2021-05-25 16:20:56 +08:00
ZhangBiao d09ff174d2 【修行】取消玩家信息界面神印神将头像,练气期预览报错修改 2021-05-25 15:50:41 +08:00
ZhangBiao 1ab094facb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 15:00:07 +08:00
ZhangBiao d00e5f99a7 【修行】神印界面调整 2021-05-25 14:59:59 +08:00
zhangqiang 1848a666e9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 14:53:41 +08:00
wangzhenxing 69d0f3ab39 公会福利红包修改提交 2021-05-25 14:52:02 +08:00