Commit Graph

2112 Commits (d5c6d690b0c01d452595be81af52b4f96e5583d6)

Author SHA1 Message Date
jiaoyangna d5c6d690b0 四灵提交 2021-02-04 17:41:44 +08:00
jiaoyangna e950d3d45a 四灵提交 2021-02-04 17:03:14 +08:00
jiaoyangna 8eb3babc04 四灵提交 2021-02-04 15:12:37 +08:00
jiaoyangna c8a2308b00 四灵协议提交 2021-02-03 18:40:26 +08:00
jiaoyangna 6a638b4a64 四灵提交 2021-02-03 14:29:22 +08:00
ZhangBiao 4462e6f814 【建木神树】神应属性界面修改 2021-01-27 14:21:50 +08:00
ZhangBiao b6640cc370 【建木神树】显示修改 2021-01-27 11:50:44 +08:00
ZhangBiao ae44413f53 【建木神树】修改 2021-01-26 15:38:30 +08:00
jiaoyangna 8e0047d5e8 Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
2021-01-26 14:48:06 +08:00
zhangqiang a2ed23dd24 Revert "tips loading tijiao"
This reverts commit 27066d7033.
2021-01-26 11:00:12 +08:00
jiaoyangna 6a100b3199 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2021-01-25 18:10:19 +08:00
jiaoyangna 27066d7033 tips loading tijiao 2021-01-25 18:10:14 +08:00
ZhangBiao 125e2bcdc0 【邮件领取】领取邮件bug修复 2021-01-25 16:04:44 +08:00
zhangqiang 4cec608eed 【巅峰赛】回滚提交2 2021-01-25 11:33:37 +08:00
zhangqiang daa18f8996 Revert "【巅峰赛 bug】 三局两胜 第三场不刷新bug 3"
This reverts commit f6de94dcd5.
2021-01-25 11:27:25 +08:00
zhangqiang 13bca53a69 Revert "【巅峰赛 bug】 三局两胜 第三场不刷新bug 2"
This reverts commit 55383c6684.
2021-01-25 11:26:56 +08:00
zhangqiang 82bb3d164e 【巅峰赛】回滚提交1 2021-01-25 11:26:42 +08:00
jiaoyangna dd70f63590 Merge branch '0功能/本周版本优化内容' into master_xma_local 2021-01-22 18:16:02 +08:00
gaoxin cd40920949 【战斗】log打印添加结果数据 2021-01-22 17:45:01 +08:00
jiaoyangna bf473b0924 召唤,抽取修改 2021-01-22 17:33:44 +08:00
jiaoyangna 04511de9f5 【优化】LOADING背景图和TIPS应该多一些 2021-01-22 16:29:19 +08:00
gaoxin 745646b06e 【战斗】添加获取各阵营伤害的接口 2021-01-22 16:19:40 +08:00
gaoxin 5dcf4d8040 【战斗】回滚27号版本不需要的内容 2021-01-22 16:19:13 +08:00
zhangqiang f44dcc20b7 Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-01-22 15:29:46 +08:00
zhangqiang 1d26186851 【挂机】挂机奖励展示问题修改 2021-01-22 13:29:21 +08:00
gaoxin 43965a452f 【战斗】上报日志结构修改,添加结果书v就 2021-01-22 12:20:53 +08:00
gaoxin 0899be29ba 【战斗】战斗异常上报数据添加战斗id字段,处理竞技场战斗不会上报数据的问题 2021-01-22 11:57:56 +08:00
wangzhenxing 33d0c7a2fd 【战斗】================增加304被动 2021-01-21 20:31:41 +09:00
wangzhenxing 94f31a58da 【战斗】========观音技能被动修改 2021-01-21 18:55:58 +09:00
wangzhenxing ecb47b16e8 [战斗]=========新将观音代码提交 2021-01-21 16:06:24 +09:00
ZhangBiao c76035f0e2 【新将来袭优化】优化BOSS血量百分比显示 2021-01-21 15:31:22 +08:00
zhangqiang f6de94dcd5 【巅峰赛 bug】 三局两胜 第三场不刷新bug 3 2021-01-21 14:50:37 +08:00
zhangqiang 55383c6684 【巅峰赛 bug】 三局两胜 第三场不刷新bug 2 2021-01-21 14:48:08 +08:00
zhangqiang 6b8196637e 【巅峰赛 bug】 三局两胜 第三场不刷新bug 2021-01-21 14:47:51 +08:00
zhangqiang 48f6cef07f 【车迟斗法】车迟斗法抢夺目标排序错误,未按照顺位直接排列 2021-01-21 14:35:05 +08:00
zhangqiang 549d54871f 【音效】在关卡界面开关排行榜,背景音乐不会随着切换 2021-01-21 13:53:12 +08:00
jiaoyangna aa8989ae73 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-21 13:44:23 +08:00
jiaoyangna 841e1e5bf5 【ID1012358】
【tips】拥有永久皮肤后再使用皮肤提示信息异常需要优化
2021-01-21 13:44:19 +08:00
zhangqiang 35a1e5d447 【公会副本】排行奖励展示修复 2021-01-21 11:34:03 +08:00
zhangqiang fc167398d6 【神将】神将上限999,继续通过碎片合成会导致游戏崩溃 2021-01-21 11:10:29 +08:00
gaoxin 09fcfff167 【数数】修改判断获取设备id的方法 2021-01-20 19:25:43 +08:00
guowei f86c0122bc 【魂印添加新手引导】 2021-01-20 17:26:31 +08:00
gaoxin 606b98aadd 【数数】尝试使用数数的设备id 2021-01-20 15:34:33 +08:00
wangzhenxing bf040e7544 新将观音提交 2021-01-20 16:08:44 +09:00
JieLing 735503707b Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2021-01-18 17:29:26 +08:00
guowei 827163728c 【巅峰赛头像修改】 2021-01-18 17:29:12 +08:00
wangzhenxing 8327a4326c [战斗]======被动 137 修改 复活后血量显示修改 2021-01-18 17:27:30 +09:00
wangzhenxing ba6661c0f8 [战斗]========被动154修改 新增300被动 Hot 添加修改治疗量的接口,复活接口添加界面显示 2021-01-18 17:26:39 +09:00
wangzhenxing 95e15caa9a [战斗]======被动 137 修改 复活后血量显示修改 2021-01-18 17:13:51 +09:00
zhangqiang f6b4a710c8 【战斗回放】大闹天宫战斗后,在森罗幻境中查看战斗回放,播放的是大闹天宫回放 2021-01-18 15:50:56 +08:00