Commit Graph

247 Commits (607104b4caa407a91c769eec050ba4ca4ab0e537)

Author SHA1 Message Date
jiaoyangna bcef9f04f5 [主题活动] 2020-12-17 15:34:21 +08:00
zhangqiang 74aef8e711 Merge branch '0功能/跨服十绝阵' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-12-16 20:27:53 +08:00
zhangqiang ec7b10d08e Merge branch '0功能/跨服天梯' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_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/Net/NetManager.lua
2020-12-16 17:21:11 +08:00
zhangqiang fd28024dc2 【跨服天梯】提交 2020-12-16 11:28:57 +08:00
jiaoyangna 175752ea75 [跨服十绝阵] 提交 2020-12-11 15:28:44 +08:00
jiaoyangna 84f6ea27ed 【博文多识】 2020-12-10 11:38:11 +08:00
zhangqiang 098c66e5b8 【跨服天梯】资源预设提交 2020-11-19 18:30:19 +08:00
jiaoyangna 44a1d94860 神医天降修改 2020-11-13 15:47:04 +08:00
zhangqiang 21988be4e2 【觉醒】 觉醒成功替换资源 2020-11-13 11:18:46 +08:00
zhangqiang e9d984b329 Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-11-12 19:34:29 +08:00
zhangqiang 8b15fe28eb 【献祭坛】11.5 资源提换 2020-11-12 18:12:02 +08:00
ZhangBiao 2c143deea9 Merge branch '0活动开发聚集地/灵兽抽卡' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-11-12 17:21:42 +08:00
zhangqiang b1128dd88e 【献祭坛】适配调试 2020-11-12 17:05:34 +08:00
jiaoyangna 358ecb8166 [玄机妙算] 提交 2020-11-12 15:10:52 +08:00
jiaoyangna a6483b3181 [灵兽特惠] 提交 2020-11-12 11:31:33 +08:00
zhangqiang 0ca5e4ea13 【觉醒】bug 2020-11-11 20:21:37 +08:00
zhangqiang 48e6d33b7b 【神将觉醒】 效果图 资源 提交 2020-11-10 17:29:38 +08:00
ZhangBiao d493246f2f 【灵兽抽卡】 开坑 2020-11-10 11:34:19 +08:00
jiaoyangna 22038419b7 神医天降提交 2020-11-06 19:54:00 +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
jiaoyangna e8be02de87 [移山倒海] 提交 2020-11-06 10:49:08 +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
JieLing 04ba352791 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
ZhangBiao 8640018b87 【易经宝库】开坑 搭界面 和做动画 2020-11-02 18:05:24 +08:00
gaoxin 3cdc100777 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
gaoxin 23253f96a2 【社稷大典】名字重复的资源处理 2020-11-01 16:23:08 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
liujiaqi c16a291063 逍遥特权图标资源 2020-10-30 13:28:10 +08:00
jiaoyangna 4b88ce6eb3 【运筹帷幄】限时召唤界面,up将白片 2020-10-30 10:09:04 +08:00
zhangqiang 6c1cf4de1a 【运筹帷幄】1 2020-10-30 10:08:41 +08:00
gaoxin 9add8d8dbf 【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题) 2020-10-27 13:53:32 +08:00
JieLing e1a8028ec6 【资源】部分资源位置修改,防止热更资源过大 2020-10-27 11:03:08 +08:00
jiaoyangna d8f5a48811 【累计充值】提示修改 2020-10-26 16:51:47 +08:00
ZhangBiao 620862f64f Merge branch '0活动开发聚集地/新将来袭' into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_01.prefab.meta
#	Assets/ManagedResources/Prefabs/Live2d/live2d_c_bgj_00091.prefab
#	Assets/ManagedResources/Prefabs/Live2d/live2d_c_mjn_00063.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua
2020-12-07 10:33:26 +08:00
ZhangBiao 1222f1df0c 【新将来袭】开坑 2020-12-01 13:51:13 +08:00
zhangqiang 3f2029a681 旗开得胜 提交 2020-11-25 21:02:16 +08:00
ZhangBiao 3bcc15d21d 【主题活动】降龙伏虎banner替换 2020-11-24 11:08:03 +08:00
jiaoyangna ffdb9c20eb 图片提交 2020-11-19 18:31:11 +08:00
jiaoyangna 3e7c24c029 【主题活动】降龙伏虎 2020-11-18 18:15:50 +08:00
jiaoyangna ed6842d354 [变幻莫测] 资源提交 2020-09-20 00:15:43 +08:00
zhangqiang 26d1bba3dc 变幻莫测 提交 2020-12-03 15:00:49 +08:00
jiaoyangna bfc6d0810b Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
2020-09-20 17:08:59 +08:00
gaoxin d0c0cd3f2c Merge branch 'master_xma_local' into master_develop 2020-11-20 15:39:30 +08:00
gaoxin b516397443 Merge branch 'master_xma_local' into master_develop 2020-11-19 14:54:12 +08:00
gaoxin 8b001af5b6 Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/Atlas/RoleInfoAtlas/r_hero_juexinchengong.png.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
2020-11-13 19:48:27 +08:00
ZhangBiao c2933ddb96 Merge branch '0活动开发聚集地/灵兽抽卡(可更换兽)' into master_develop
# Conflicts:
#	Assets/ManagedResources/BG/lingshou_lingshoubeijing_03.jpg.meta
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
2020-11-13 14:20:49 +08:00
zhangqiang 33a40c700d 【献祭坛】 适配修改 2020-11-12 16:57:50 +08:00
zhangqiang 82a2d14bb6 【觉醒】bug 2020-11-11 20:19:54 +08:00
zhangqiang f746575b10 Merge branch '0功能/神将觉醒' into master_develop 2020-11-11 11:38:43 +08:00