Commit Graph

215 Commits (f939a42d0d85796ef88ff498ebccd7396ee768ec)

Author SHA1 Message Date
zhangqiang 37181c6ec7 【资源】资源路径变更 2021-01-13 17:29:15 +08:00
zhangqiang 005dfc0eff 【破阵诛仙】替换资源banner 2021-01-13 17:11:00 +08:00
zhangqiang 1e78f3ff35 【资源替换】 必出金色任务 2021-01-13 15:33:39 +08:00
jiaoyangna 76f33e87d4 主题活动 2021-01-13 11:01:41 +08:00
jiaoyangna 5809df035a 主题活动 2021-01-12 10:59:04 +08:00
jiaoyangna 4627e88c2f 主题活动提交 2021-01-12 10:39:41 +08:00
zhangqiang b942b82c80 【资源导入】灵兽宝阁 金乌文字 2021-01-08 16:56:51 +08:00
jiaoyangna 3cecf72861 铜墙铁壁 2021-01-07 16:22:36 +08:00
zhangqiang 7bedefc780 【战斗回放】 2021-01-06 16:12:54 +08:00
JieLing cdd6f979c8 【狭路相逢】资源调整位置 2021-01-04 18:13:16 +08:00
ZhangBiao 71c18b1e94 狭路相逢 2021-01-04 15:52:13 +08:00
ZhangBiao 667adb2ba1 【资源替换】重置界面妖晶资源替换 2020-12-31 17:18:37 +08:00
jiaoyangna d249a4c0c1 【优化】挂机宝箱显示当前的挂机时间 2020-12-31 15:55:20 +08:00
zhangqiang a6d16c13e5 【寻宝】加锁 2020-12-30 18:08:44 +08:00
jiaoyangna 223c23f4bd [狭路相逢] 提交 2020-12-30 15:56:11 +08:00
zhangqiang 739f390115 Merge branch 'master_xma_local' into 0功能/1月6_版本优化
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
2020-12-29 17:00:08 +08:00
jiaoyangna 1cf3f17888 【优化】神将解锁锁定状态基本看不出来,让其更加明显 2020-12-29 14:23:53 +08:00
zhangqiang 2576c5bcdd 【新将来袭】banner 图片替换 2020-12-29 12:13:29 +08:00
jiaoyangna fffb834f8a 【优化】挂机宝箱显示当前的挂机时间 2020-12-29 11:26:34 +08:00
JieLing d86c2dc822 【资源修改】 2020-12-28 20:04:59 +08:00
JieLing 91cfcb8ccd 【资源文件夹】 2020-12-28 19:28:05 +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
zhangqiang 26778992fa 【资源导入】 buff图标 和 状态字混乱 2020-12-26 11:57:58 +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
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