Commit Graph

56 Commits (119be29c7d8fb1eb5a020b7ea330d14d4b361d7c)

Author SHA1 Message Date
zhangqiang e9d984b329 Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-11-12 19:34:29 +08:00
ZhangBiao a5c36cf58a 【灵兽宝阁】未开启更换灵兽版本 2020-11-12 17:11:18 +08:00
zhangqiang adf9c87ac2 【灵兽提交】bug修改 2020-11-11 20:21:13 +08:00
ZhangBiao 1ba753044f 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
zhangqiang 6a1693939c 【觉醒】 觉醒添加图鉴 2020-11-09 20:05:51 +08:00
ZhangBiao 5e130a7585 Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 16:17:12 +08:00
gaoxin d668e4ffc3 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
2020-11-06 11:19:46 +08:00
gaoxin 1ac0e6fc53 【战斗】添加新的假战斗功能 2020-11-06 11:18:09 +08:00
ZhangBiao 6f75850ae4 【易经宝库】提交 2020-11-05 19:10:20 +08:00
ZhangBiao 476057bd1c 【易经宝库】主界面奖励显示 通用奖励界面创建 2020-11-04 19:51:58 +08:00
jiaoyangna 509357e333 Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2020-11-04 10:54:54 +08:00
jiaoyangna e92e63444b 皮肤提交 2020-11-03 17:27:32 +08:00
ZhangBiao f79499faea 【易经宝库】开始获取活动数据 2020-11-03 09:58:37 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
ZhangBiao 8a1a1b2442 【社稷大典】提交3 2020-10-24 18:29:05 +08:00
gaoxin 619ce2ea52 【逍遥游】筛子摇动和事件触发音效添加 2020-10-20 17:43:18 +08:00
gaoxin 19135670ce Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-19 20:40:14 +08:00
gaoxin 364c9c99fc 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +08:00
ZhangBiao e39706e312 遴选 社稷大典中对奖励界面的修改,到竞技场界面修改 2020-10-19 14:01:30 +08:00
ZhangBiao 09c3da664e 通用奖励界面 设计大典->竞技场界面修改 2020-10-19 13:54:08 +08:00
ZhangBiao c4706208ef 三界除魔功能添加 2020-09-27 16:43:33 +08:00
JieLing c6391090f2 三界除魔界面添加 2020-09-27 16:38:44 +08:00
zhangqiang 24f6333726 线上问题: 试炼节点显示立绘与招募得到的不一致 前端修改 2020-09-22 17:33:57 +08:00
zhangqiang 9b2b85f6b5 关闭sdk数据打点,使用海外sdk时需打开 2020-08-25 10:21:31 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +08:00
zhangqiang e1b223e83f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
#	data_execl/base_data/RewardGroup.xlsx
#	data_execl/base_data/RewardItemConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
#	data_execl/base_data/StoreConfig.xlsx
#	data_execl/base_data/UIConfig.xlsx
2020-08-22 13:59:35 +08:00
zhangqiang b725617a8d 公会副本提交 2020-08-21 15:52:49 +08:00
jiaoyangna 6b0af3d7fb pozhenzhuxian commit 2020-08-20 17:36:19 +08:00
zhangqiang 869481a2cd 公会副本部分提交 2020-08-19 17:28:17 +08:00
jiaoyangna 4e1236de8c qinglongserecttreasure commit 2020-08-19 10:05:01 +08:00
jiaoyangna 9f186311b3 xuanyuan 2020-08-11 15:11:33 +08:00
zhangqiang 32c788b8ac 神将合成代码 2020-08-08 18:18:26 +08:00
zhangqiang 17b6db91e2 英雄合成提交部分代码 2020-08-08 15:51:55 +08:00
ZhangBiao 203514d85f 神将置换入口添加 2020-08-05 16:30:02 +08:00
ZhangBiao 6f0c40707e 置换界面 2020-08-05 14:10:46 +08:00
zhangqiang 7b73f4ae77 升星成功界面加天赋解锁显示 2020-08-04 17:24:15 +08:00
ZhangBiao 48ac527f1a 限时召唤 乾坤宝盒 页面整合 2020-07-28 09:48:02 +08:00
zhangqiang 1845d662ab 巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称 2020-09-07 21:15:40 +08:00
zhangqiang 3588a17c00 Merge branch 'master_develop' into master_arena
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	data_execl/base_data/UIConfig.xlsx
2020-07-23 21:24:00 +08:00
zhangqiang 94684153c3 回放三局两胜显示 2020-07-23 18:06:55 +08:00
jiaoyangna 5894babbf0 英雄献祭修改提交 2020-07-23 16:26:51 +08:00
jiaoyangna 03107d240a 轩辕宝镜提交 2020-07-21 10:42:20 +08:00
jiaoyangna 04e9a24db0 xuanyuanmirror tijiao 2020-07-20 19:46:08 +08:00
ZhangBiao b89c0582c0 宝囊 2020-07-10 17:55:11 +08:00
zhangqiang bff7df21e4 装备出售界面添加 2020-07-07 15:20:43 +08:00
zhangqiang 70bbb3cee2 竞技场修改 2020-07-07 13:29:40 +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 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