Commit Graph

55 Commits (50de01d5a073ac275568885ba65487b906e04800)

Author SHA1 Message Date
JieLing cdd6f979c8 【狭路相逢】资源调整位置 2021-01-04 18:13:16 +08:00
ZhangBiao 71c18b1e94 狭路相逢 2021-01-04 15:52:13 +08:00
jiaoyangna 223c23f4bd [狭路相逢] 提交 2020-12-30 15:56:11 +08:00
JieLing f799c5432c 【资源调整】2 2020-12-28 18:59:53 +08:00
zhangqiang bbddb9e2ec 【资源调整】 2020-12-28 18:25:51 +08:00
gaoxin bf6fd2d13d Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-12-26 20:22:23 +08:00
jiaoyangna 1f05f5f8f6 逍遥游 红点提交 2020-12-24 16:19:46 +08:00
jiaoyangna 171e9a4690 【优化】巅峰赛,十绝阵预告图标双行文字优化 2020-12-24 10:45:15 +08:00
jiaoyangna 0054f5e646 【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名) 2020-12-24 10:37:38 +08:00
jiaoyangna 5a0bece22e 所向披靡修改 2020-12-24 10:23:02 +08:00
ZhangBiao 38a1eeee9a Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-12-23 11:29:12 +08:00
ZhangBiao e40364082c Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-12-23 11:21:27 +08:00
ZhangBiao 30f8049ef5 Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-12-23 11:13:48 +08:00
ZhangBiao 8d245aab44 【降妖夺宝】开坑 2020-12-21 17:13:05 +08:00
ZhangBiao 12760d7cb1 【升星有礼】完成 2020-12-21 15:41:31 +08:00
jiaoyangna 9f01de23ea [主题活动] 2020-12-18 11:22:54 +08:00
jiaoyangna 0a1e1666f7 【博文多识】 2020-12-12 17:21:13 +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 44a1d94860 神医天降修改 2020-11-13 15:47:04 +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
jiaoyangna 358ecb8166 [玄机妙算] 提交 2020-11-12 15:10:52 +08:00
jiaoyangna a6483b3181 [灵兽特惠] 提交 2020-11-12 11:31:33 +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
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
jiaoyangna 4b88ce6eb3 【运筹帷幄】限时召唤界面,up将白片 2020-10-30 10:09:04 +08:00
zhangqiang 6c1cf4de1a 【运筹帷幄】1 2020-10-30 10:08:41 +08:00
jiaoyangna 2df6f4076e [变幻莫测] 资源提交 2020-09-17 12:37:02 +08:00
zhangqiang 6a0a52997c 变幻莫测 提交 2020-09-17 12:35:45 +08:00
jiaoyangna 68af385814 冲突提交 2020-10-29 10:29:14 +08:00
jiaoyangna a9634c226f yongwangzhiqian commit 2020-10-24 19:12:28 +08:00
ZhangBiao a62dc62ead 【社稷大典】提交 2020-10-24 18:20:43 +08:00
jiaoyangna 06dcc9f41c 勇往直前 提交 2020-10-21 14:13:07 +08:00
ZhangBiao 0dbf805ef8 限时召唤 更换主Up神将
(cherry picked from commit 90a5c3f28d)
2020-10-23 17:38:45 +08:00
jiaoyangna aa9878a1f2 势不可挡 提交 2020-10-10 16:14:18 +08:00
jiaoyangna d249eb412f 丹心碧血提交 2020-10-15 14:05:56 +08:00
jiaoyangna 7c38428100 丹心碧血图片提交 2020-10-15 14:04:45 +08:00
jiaoyangna 054ea80a3c 活动icon 提交 2020-09-29 10:30:19 +08:00
liujiaqi 783c61eed8 修复新玩家登陆卡在登陆100% 2020-09-27 20:40:20 +08:00
JieLing 907d092c04 遗漏同步提交 2020-09-27 18:27:20 +08:00
gaoxin 7b7def3f8f 勇冠三军,叱咤风云活动添加 2020-09-27 16:09:55 +08:00
zhangqiang 77706e50cc 首冲有礼加特效 2020-08-25 14:46:57 +08:00