Commit Graph

217 Commits (bc2d95ddec8e7755621bccbaa72cefa6495e261d)

Author SHA1 Message Date
jiaoyangna bc2d95ddec 四灵 提交 2021-02-26 17:44:13 +08:00
jiaoyangna 6d1d7c7996 战斗回放类型修改 2021-02-22 18:42:26 +08:00
jiaoyangna 8eb3babc04 四灵提交 2021-02-04 15:12:37 +08:00
jiaoyangna c8a2308b00 四灵协议提交 2021-02-03 18:40:26 +08:00
jiaoyangna 8e0047d5e8 Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_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/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
2021-01-26 14:48:06 +08:00
DESKTOP-98AVA47\Administrator 040971534e 【巅峰赛限时头像修改】 2021-01-15 21:06:48 +08:00
ZhangBiao ba747de291 【巅峰赛】帮助修改 2021-01-14 16:08:26 +08:00
zhangqiang ecbde627e4 【战斗回放】bug 2021-01-07 18:03:57 +08:00
zhangqiang 7bedefc780 【战斗回放】 2021-01-06 16:12:54 +08:00
jiaoyangna c1c15d6c8b 四灵试炼 2021-01-04 11:39:58 +08:00
ZhangBiao 853b541fb5 【抽卡提示】六个抽卡分别加上妖晶提示
(cherry picked from commit 73aeaf3d89)
(cherry picked from commit 56cf5e10600a72ca635592f4ae6a2298542c7cc9)
2020-12-31 10:50:14 +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
gaoxin 104505622a Merge branch 'gx/xma_local' into master_xma_local 2020-12-26 18:28:21 +08:00
ZhangBiao 28a3341fa1 【增加跳转】化灵符跳转零售特惠
(cherry picked from commit bc582d93e0)
2020-12-24 16:43:22 +08:00
ZhangBiao 4faa39ab2a 【道具使用跳转】使用跳转修改,活动道具要大于10000
(cherry picked from commit b2f8d14470)
2020-12-24 16:42:24 +08:00
ZhangBiao 6fc63af086 【增加跳转】增加跳转id 2020-12-23 11:31:58 +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 f7f0d4099f 【降妖夺宝】结束 2020-12-23 10:34:47 +08:00
jiaoyangna 27568171e5 [四灵] 提交 2020-12-22 20:33:35 +08:00
jiaoyangna 9c412cad00 [四灵试炼] 提交 2020-12-21 20:24:36 +08:00
ZhangBiao 8d245aab44 【降妖夺宝】开坑 2020-12-21 17:13:05 +08:00
gaoxin 03e3d77bb6 【优化】橙色改为金色 2020-12-21 16:15:17 +08:00
ZhangBiao 12760d7cb1 【升星有礼】完成 2020-12-21 15:41:31 +08:00
jiaoyangna c4a0cab9a8 Merge branch '0功能/建木神树' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2020-12-21 10:46:53 +08:00
jiaoyangna 8ff2d808cd 四灵试炼 提交 2020-12-21 10:37:37 +08:00
jiaoyangna 5aa171267d 四灵协议提交 2020-12-21 09:51:08 +08:00
ZhangBiao 72e22a7234 【建木神树】战力对上了,就差调两个界面了 2020-12-14 17:14:42 +08:00
jiaoyangna 4519f70c54 四灵试炼commit 2020-12-14 09:54:50 +08:00
ZhangBiao d762af1660 【建木神树】神应属性界面 2020-12-11 16:03:27 +08:00
ZhangBiao 44c848ac37 【建木神树】 2020-12-10 14:15:07 +08:00
ZhangBiao 048a68a932 【建木神树】提交 2020-12-10 11:26:56 +08:00
jiaoyangna 8b7a227a54 【四灵试炼】预设提交 2020-12-08 17:01:53 +08:00
ZhangBiao b3e374e336 【神将来袭】基本完事儿 2020-12-03 18:36:01 +08:00
ZhangBiao 86d190572a 【神将来袭】加战斗了 2020-12-02 17:14:52 +08:00
ZhangBiao ecb948a613 【神将来袭】真·差战斗 和为小游戏转盘增加log 2020-12-02 15:42:38 +08:00
ZhangBiao 2f07beaa08 【新将来袭】差战斗了 2020-12-02 09:51:17 +08:00
ZhangBiao 2d51e11e10 【神将来袭】代码完善 2020-12-01 15:52:34 +08:00
ZhangBiao 1222f1df0c 【新将来袭】开坑 2020-12-01 13:51:13 +08:00
ZhangBiao 8a5d51e2a3 【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27)
2020-11-13 12:12:44 +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
ZhangBiao 2563c6bdd6 【灵兽宝阁】货币显示修复 2020-11-12 18:17:56 +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
ZhangBiao a5c36cf58a 【灵兽宝阁】未开启更换灵兽版本 2020-11-12 17:11:18 +08:00
jiaoyangna a6483b3181 [灵兽特惠] 提交 2020-11-12 11:31:33 +08:00
ZhangBiao 1ba753044f 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
zhangqiang 48e6d33b7b 【神将觉醒】 效果图 资源 提交 2020-11-10 17:29:38 +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
ZhangBiao b516a8c202 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00