Commit Graph

40 Commits (04a1dacedd7d049267b0f814fe0ea9596af9d08d)

Author SHA1 Message Date
jiaoyangna bc2d95ddec 四灵 提交 2021-02-26 17:44:13 +08:00
jiaoyangna fdf9a1c913 四邻bug 修改 2021-02-22 20:25:58 +08:00
jiaoyangna 80deb6428f 四灵提交 2021-02-07 17:54:48 +08:00
jiaoyangna c8a2308b00 四灵协议提交 2021-02-03 18:40:26 +08:00
jiaoyangna 6a638b4a64 四灵提交 2021-02-03 14:29:22 +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
jiaoyangna c1c15d6c8b 四灵试炼 2021-01-04 11:39:58 +08:00
zhangqiang 95c753a70e 【大闹天宫】上阵纯治疗神将,战斗失败后选择保留状态,报错 2020-12-24 16:52:46 +08:00
jiaoyangna 27568171e5 [四灵] 提交 2020-12-22 20:33:35 +08:00
jiaoyangna 9c412cad00 [四灵试炼] 提交 2020-12-21 20:24:36 +08:00
jiaoyangna 5aa171267d 四灵协议提交 2020-12-21 09:51:08 +08:00
jiaoyangna 26c6fa1894 [四灵试炼] 预设代码提交 2020-12-10 16:23:13 +08:00
jiaoyangna 8b7a227a54 【四灵试炼】预设提交 2020-12-08 17:01:53 +08:00
zhangqiang aa2db3e25e 【大闹天宫】 节点boss 站位错误 修复 2020-11-06 16:51:44 +08:00
ZhangBiao eb7b46f992 大闹天宫节点商店名称与内容不符修复
(cherry picked from commit 314dee578a)
2020-10-10 14:51:45 +08:00
zhangqiang f56fa9d4e8 线上问题 大闹天宫招募带宝器的英雄是报错 2020-10-09 15:20:53 +08:00
zhangqiang 24f6333726 线上问题: 试炼节点显示立绘与招募得到的不一致 前端修改 2020-09-22 17:33:57 +08:00
zhangqiang 220a8f216e 大闹天宫背景 大闹天宫女例会比例 公会技能更新战力调整位置 2020-08-29 16:15:41 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
gaoxin a4bcead414 无用log删除 2020-07-31 18:04:11 +08:00
jiaoyangna a1e08138d0 expedition head frame update 2020-08-06 13:55:35 +08:00
jiaoyangna 60bf046b81 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 16:54:43 +08:00
jiaoyangna 38a69a4017 编队添加特效 2020-07-28 16:54:38 +08:00
zhangqiang 2a87d43fd0 bug 2020-07-31 17:36:06 +08:00
jiaoyangna e71f82795a 编队界面修改提交 2020-07-27 14:13:31 +08:00
jiaoyangna 48c209b4aa formation commit 2020-07-25 22:58:55 +08:00
jiaoyangna 0c2239bd11 编队修改提交 2020-07-25 13:21:30 +08:00
gaoxin b5ab2384c3 优化rendertexture的数量20->6 2020-07-08 21:21:49 +08:00
JieLing 461c64b04a svn逻辑同步 2020-07-02 14:53:44 +08:00
JieLing d08552ca2f 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
JieLing 7382b2db77 版本开发提交 2020-06-28 17:52:29 +08:00
JieLing 8c61581548 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing 7a410e1b60 内网测试 0.15.5 2020-06-19 16:18:05 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
JieLing cf5f3e9952 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
JieLing 90e12f1a4a 外网0.16.5,测试0.15.11 2020-06-08 20:18:49 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 063868ce73 外网包 0.16.1 2020-05-25 19:16:23 +08:00