Commit Graph

4817 Commits (74077e248476a7e549388a41cb9cb22fb84d6362)
 

Author SHA1 Message Date
jiaoyangna b7a0cca0fe 成长基金修改提交 2021-03-30 22:19:54 +08:00
ZhangBiao bdcfd4cc65 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:09:38 +08:00
ZhangBiao 3a23cb6cae 【青龙秘宝】解锁秘宝特权时,可直接领取的奖励显示区域超框 2021-03-30 22:09:25 +08:00
jiaoyangna 6a16612ab1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:07:05 +08:00
jiaoyangna c69cc0cc14 每日充值显示错误修改 2021-03-30 22:06:59 +08:00
ZhangBiao d4b843d972 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 22:03:59 +08:00
ZhangBiao 4dcdd67648 【极速探索优化】更改极速探索界面,突出激活探索特权的按钮 2021-03-30 22:01:58 +08:00
gaoxin 599a98b3a8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 21:24:58 +08:00
gaoxin 23e5bb6f98 【五星成长礼】添加箭头动画 2021-03-30 21:23:42 +08:00
zhangqiang ecf18e4b5a 【称号坐骑时装】大地图修改 2021-03-30 21:11:27 +08:00
jiaoyangna ed6e825266 去掉限时抢购 2021-03-30 21:04:48 +08:00
jiaoyangna ad24255948 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 21:02:36 +08:00
gaoxin 41c646817b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 20:46:55 +08:00
gaoxin 6e34c88fa5 【人物信息栏】修复战力刷新不及时的问题 2021-03-30 20:46:47 +08:00
jiaoyangna ef9d80e9b0 刷新资源 提交 2021-03-30 20:44:24 +08:00
jiaoyangna 0494e55215 Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
2021-03-30 20:41:32 +08:00
jiaoyangna c9c9dbf43e 资源提交 2021-03-30 20:36:23 +08:00
jiaoyangna 833aaec022 活动 提交 2021-03-30 20:35:53 +08:00
wangzhenxing 0820df94d7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 20:34:09 +08:00
wangzhenxing 1a3086a2e3 【战斗】==============被动168 修改 bugId: 1014123 2021-03-30 20:33:39 +08:00
gaoxin f9d9a0b5cc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 20:32:14 +08:00
jiaoyangna 1465efa8b2 活动 提交 2021-03-30 20:32:05 +08:00
gaoxin 2eb4077b5c 【资源】坐骑,称号资源上传 2021-03-30 20:31:48 +08:00
ZhangBiao 98a49ad693 Merge branch 'china/dev' into 0活动开发聚集地/福星高照 2021-03-30 20:28:12 +08:00
ZhangBiao 2984f6f63b 【注释】注释部分log 2021-03-30 20:27:40 +08:00
gaoxin 1973afd058 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 20:23:06 +08:00
gaoxin c88cd5b7e1 【主界面】扩大场景的显示范围 2021-03-30 20:22:57 +08:00
ZhangBiao 62a064b33e Merge branch 'china/dev' into 0活动开发聚集地/福星高照 2021-03-30 20:21:32 +08:00
zhangqiang d6c61b7a11 【归元修改】向后的发送战力改变 2021-03-30 20:20:42 +08:00
ZhangBiao 9ed1f4f8c2 【福星高照】增加拍脸 2021-03-30 20:20:12 +08:00
zhangqiang ea9d0ba287 【称号坐骑时装】 激活时 向后的发送战力改变 2021-03-30 20:20:00 +08:00
jiaoyangna 23b46ba218 活动 修改提交 2021-03-30 20:17:26 +08:00
gaoxin 9ca4850841 【特权优化】将界面顶部的特权等级移回-修复更换头像名称等不刷新,gm仅在主界面可以打开 2021-03-30 20:03:34 +08:00
gaoxin c2a5c2dc17 【特权优化】将界面顶部的特权等级移回-挂机,副本界面修啊给i 2021-03-30 19:54:19 +08:00
zhangqiang cfaeff6759 【特权优化】 vip 公会 vip 升级战力提升 2021-03-30 19:49:49 +08:00
zhangqiang 365a694eca 【称号坐骑时装】 跳章节修改 2021-03-30 19:18:32 +08:00
ZhangBiao d61c55d24d Merge branch 'china/dev' into 0活动开发聚集地/福星高照
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-03-30 18:55:35 +08:00
ZhangBiao 685ace078a 【福星高照】增加协议 2021-03-30 18:50:15 +08:00
gaoxin 8161aca202 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 18:42:38 +08:00
gaoxin 3cc0b51edd 【特权优化】将界面顶部的特权等级移回-神将、背包界面修改,修复战斗和vip等级不及时刷新的问题 2021-03-30 18:42:30 +08:00
jiaoyangna c2fac79eca 活动 提交 2021-03-30 18:26:10 +08:00
jiaoyangna d860db875d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 18:19:12 +08:00
jiaoyangna 7d9a5a62ba 天书秘卷 提交 2021-03-30 18:18:16 +08:00
zhangqiang 127a019a1b 【归元修改】漏提 2021-03-30 18:13:05 +08:00
gaoxin 202658d6d9 【特权优化】将界面顶部的特权等级移回 2021-03-30 18:10:39 +08:00
ZhangBiao e3fb9025a9 【福星高照】提交 2021-03-30 17:53:01 +08:00
gaoxin 81a87576a3 【战斗】修复敌方灵兽数据判断错误,我方没有灵兽时会导致敌方灵兽消失 2021-03-30 17:44:44 +08:00
zhangqiang aabe3e082f 【归元修改】资源提交 2021-03-30 17:31:44 +08:00
wangzhenxing 33852141c6 【战斗】============被动245 去除 是不是追加技能得判断 2021-03-30 17:27:37 +08:00
wangzhenxing 3fc6c20439 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 17:17:47 +08:00