Commit Graph

171 Commits (3f54c121b10cd05a5a136f913d868454ba90bfe1)
 

Author SHA1 Message Date
gaoxin 3f54c121b1 sdk=接口完善 2020-07-13 12:25:55 +08:00
gaoxin fdb4c66ed5 访客id接口修改 2020-07-11 15:05:23 +08:00
gaoxin cb33f92b67 添加忽略文件 2020-07-10 10:00:46 +08:00
gaoxin 465ca19e84 sdk相关文档提交 2020-07-10 09:59:56 +08:00
2han9B1a0 f158fa6536 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 16:14:56 +08:00
2han9B1a0 10a2181305 小游戏18bugxiugai 2020-07-09 16:14:44 +08:00
kansa 7185629090 修改森罗幻境怪物属性 2020-07-09 16:10:31 +08:00
shihongyi 9383c02d40 幻境杀怪掉落初调 2020-07-09 15:58:07 +08:00
gaoxin 6e33a3e2a7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 15:18:45 +08:00
gaoxin 6303805bfa 修复未命中时报错的问题 2020-07-09 15:18:02 +08:00
kansa 55155cc2c3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 15:17:45 +08:00
kansa cca639cfba 修改森罗幻境商店错误 2020-07-09 15:15:19 +08:00
liujiaqi 83d578fbee 橙色4星装备名描述修改 2020-07-09 15:15:13 +08:00
shihongyi ac28494c82 保底优化 2020-07-09 15:02:35 +08:00
liujiaqi 2e22a79119 怪物命中率修改 2020-07-09 15:00:32 +08:00
skuld 77c2b75175 修改每日召唤上限 2020-07-09 14:51:16 +08:00
skuld 67ed992681 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
2020-07-09 14:47:26 +08:00
shihongyi 047721e3a4 修复bug 2020-07-09 14:12:39 +08:00
jiaoyangna c3e1aaff6e 【限时召唤】奖池预览,去掉一二星神将
【心魔试炼】奖励预览,数量多的时候,需要调整
2020-07-09 13:35:59 +08:00
2han9B1a0 8e853b2758 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 11:53:10 +08:00
2han9B1a0 47b34f9d6e 宝囊 2020-07-09 11:52:40 +08:00
liujiaqi 790c38edeb 英雄初始命中修改 2020-07-09 11:36:57 +08:00
shihongyi f6421e9533 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 10:54:09 +08:00
jiaoyangna 62462bd83d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 10:53:26 +08:00
jiaoyangna f9c49d00e3 宝物bug修改 2020-07-09 10:53:15 +08:00
shihongyi 6614cf3e70 乾坤宝囊up展示 2020-07-09 10:52:51 +08:00
kansa 3bd5576d98 删除怪物闪避和命中初始属性值 2020-07-09 10:52:42 +08:00
shihongyi ccfb9132f3 去掉云游商店,增加乾坤商店 2020-07-09 10:45:37 +08:00
jiaoyangna 37c7c839c4 限时召唤提交 2020-07-09 10:04:20 +08:00
gaoxin 3e43ea4876 Merge branch '优化cardrenderer' into master_develop 2020-07-08 21:23:04 +08:00
gaoxin b5ab2384c3 优化rendertexture的数量20->6 2020-07-08 21:21:49 +08:00
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
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