Commit Graph

125 Commits (78592854045af6c11bbbd38de071a3095000c8ef)

Author SHA1 Message Date
gaoxin d8b88221da 修复中心全屏特效显示错误的问题 2020-07-16 20:23:11 +08:00
gaoxin bc43f00abc 资源名重复刷新 2020-07-16 20:14:19 +08:00
gaoxin 958caebcb1 添加技能特效效果5 屏幕中心的全屏特效 2020-07-16 18:06:06 +08:00
gaoxin c5ae3c4c0b 新特效添加 2020-07-16 17:40:22 +08:00
gaoxin 01f6157c3e 特效修改 2020-07-14 16:52:30 +08:00
gaoxin bfd6a89b20 特效资源提交 2020-07-13 16:29:38 +08:00
gaoxin 74a4d7e4dd 猪八戒特效资源提交 2020-07-13 15:38:20 +08:00
gaoxin eba4b7cf50 shader引用文件提交 2020-07-13 13:38:34 +08:00
gaoxin f03214aa1a 技能音效添加 2020-07-11 15:19:08 +08:00
gaoxin ab724d407e 嫦娥,东华帝君,洛神特效添加 2020-07-10 16:22:40 +08:00
2han9B1a0 ce1d7014f3 2020-07-09 19:59:23 +08:00
2han9B1a0 12b0fa9f73 特权修改,宝囊商店 2020-07-09 18:20:53 +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
gaoxin 6303805bfa 修复未命中时报错的问题 2020-07-09 15:18:02 +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
jiaoyangna f9c49d00e3 宝物bug修改 2020-07-09 10:53:15 +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
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
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
2han9B1a0 51089bd2c8 福利界面报错 2020-07-08 11:46:43 +08:00
gaoxin b999786cbb 部分技能配置 2020-07-08 10:34:41 +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
2han9B1a0 562e482740 图鉴bug修改 2020-07-07 15:44:19 +08:00
zhangqiang bff7df21e4 装备出售界面添加 2020-07-07 15:20:43 +08:00
gaoxin 3b7e9e2cdd 特效文件新增 2020-07-07 14:33:48 +08:00
2han9B1a0 bdc2c095a7 点将台奖池修改 2020-07-07 14:16:28 +08:00