Commit Graph

14545 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)
 

Author SHA1 Message Date
2han9B1a0 12d9208f90 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 21:19:49 +08:00
2han9B1a0 7c7684a714 冲突提交 2020-07-08 21:19:34 +08:00
2han9B1a0 39d035b21a no message 2020-07-08 21:09:45 +08:00
liujiaqi 7a22636e66 角色闪避命中率修改 2020-07-08 21:05:26 +08:00
zhangqiang 0b40fda687 巅峰战 2020-07-08 20:48:43 +08:00
shihongyi ad03163b36 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 20:30:01 +08:00
shihongyi 9e4df66051 表提交 2020-07-08 20:18:24 +08:00
liujiaqi b27725bd4a 红色装备获取跳转修改 2020-07-08 20:11:35 +08:00
gaoxin ce13a0263e Merge branch '战斗优化v_n.0' into master_develop
# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Atlas/QianKunBox.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Config/Data/CombatControl.lua
#	Assets/ManagedResources/~Lua/Config/Data/SkillLogicConfig.lua
#	Assets/StreamingAssets/Android.meta
2020-07-08 19:55:09 +08:00
jiaoyangna 21778b4a74 限时提交 2020-07-08 19:16:04 +08:00
gaoxin da6bb67d50 技能配置优化 2020-07-08 18:23:12 +08:00
2han9B1a0 5e00986d05 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 17:03:44 +08:00
2han9B1a0 7e1e15f8af 报错修改 2020-07-08 17:03:34 +08:00
shihongyi df337dd2ed Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 17:00:16 +08:00
liujiaqi edbc756765 红6装备套装属性 2020-07-08 16:55:30 +08:00
shihongyi 7b43f59192 乾坤宝囊 2020-07-08 16:55:28 +08:00
jiaoyangna d247e40129 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 16:50:10 +08:00
jiaoyangna 4e49e4582a 天宫商店数量显示调整,去除log 2020-07-08 16:49:59 +08:00
2han9B1a0 d5bc2b4ef1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 16:24:27 +08:00
jiaoyangna 9b138fe566 限时召唤提交 2020-07-08 16:23:04 +08:00
2han9B1a0 1b89e68c95 包囊 2020-07-08 16:23:02 +08:00
jiaoyangna 070fb43964 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua
2020-07-08 16:20:26 +08:00
jiaoyangna 1df7a8006a 【ID1008244】
【限时招募】阶段奖励进度条显示不准
2020-07-08 16:19:46 +08:00
shihongyi ab2689b4de 修复武将升级返还资源bug、新增乾坤宝囊各种道具、修复限时抽将保底bug、修复寻宝刷出6个1星任务时异常的bug 2020-07-08 15:35:58 +08:00
zhangqiang b3dc6d0688 巅峰赛 2020-07-08 15:02:16 +08:00
liujiaqi 09270d8f85 限时招募累计奖励召唤次数修改 2020-07-08 14:46:33 +08:00
2han9B1a0 51089bd2c8 福利界面报错 2020-07-08 11:46:43 +08:00
liujiaqi 46850f0dd4 乾坤宝囊问号 2020-07-08 11:14:36 +08:00
gaoxin b999786cbb 部分技能配置 2020-07-08 10:34:41 +08:00
shihongyi e5d8e83c7f 修复bug调整部分概率 2020-07-08 10:10:17 +08:00
2han9B1a0 272cfdc71a 乾坤包囊 2020-07-08 09:41:56 +08:00
2han9B1a0 4aed395ed3 乾坤包囊 2020-07-08 09:40:36 +08:00
jiaoyangna 67b4631368 高级探宝提交 2020-07-07 20:13:36 +08:00
jiaoyangna c15b84b096 Merge branch 'master_develop' into equip
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
2020-07-07 18:13:34 +08:00
jiaoyangna 0f611408b8 合成装备刷新界面 2020-07-07 17:51:02 +08:00
2han9B1a0 9d8deac0e1 背包界面报错修改 2020-07-07 17:27:48 +08:00
jiaoyangna c6bfa772e5 装备提交 2020-07-07 16:35:57 +08:00
gaoxin 210114f62f 技能配置添加 2020-07-07 15:59:17 +08:00
2han9B1a0 562e482740 图鉴bug修改 2020-07-07 15:44:19 +08:00
zhangqiang 0a824f56ee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-07 15:21:37 +08:00
zhangqiang bff7df21e4 装备出售界面添加 2020-07-07 15:20:43 +08:00
liujiaqi 49a132852a 抽卡次数修正,装备叠加数量修改 2020-07-07 15:12:20 +08:00
gaoxin 3b7e9e2cdd 特效文件新增 2020-07-07 14:33:48 +08:00
2han9B1a0 bdc2c095a7 点将台奖池修改 2020-07-07 14:16:28 +08:00
2han9B1a0 504e6010e3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-07 10:57:34 +08:00
2han9B1a0 8eaa1f6e8c 增加 图鉴、神将归元、恭送神将界面“全部”按钮 2020-07-07 10:57:23 +08:00
gaoxin 64059c7808 导表工具优化,语言表路径修改 2020-07-07 09:48:38 +08:00
jiaoyangna 7f54e3c88a 装备提交 2020-07-06 20:35:39 +08:00
shihongyi 96d5d080d5 超值基金2期bug、公会人数调整 2020-07-06 19:58:55 +08:00
zhangqiang 105d3bf53e 宝器分解计算掉落 2020-07-06 19:11:15 +08:00