Commit Graph

145 Commits (e8410fa0c1d0dc170d04acb6084a3b6a3e248897)

Author SHA1 Message Date
jiaoyangna e8410fa0c1 资源提交 2021-11-19 18:06:17 +08:00
jiaoyangna db0fcea43e Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-19 18:01:59 +08:00
ZhangBiao 95f71667fe 【灵脉秘境】提交 2021-11-19 17:23:06 +08:00
ZhangBiao 42842f88bf 【灵脉秘境】资源提交 2021-11-19 11:47:41 +08:00
ZhangBiao 751b680be9 【灵脉】提交 2021-11-17 11:13:36 +08:00
jiaoyangna 1e4a7a57be 法宝之魂 提交 2021-11-16 15:24:17 +08:00
ZhangBiao c104bd65a7 【灵脉秘境】提交 2021-11-11 10:06:49 +08:00
ZhangBiao fdffaf846e 【新·魂灵宝】界面提交 2021-11-09 11:42:19 +08:00
ZhangBiao 9ac870db81 Merge branch 'china/dev' into 0优化/界面优化 2021-10-28 09:34:12 +08:00
ZhangBiao 3b42cd525e 【三界降魔】新活动完成 2021-10-27 18:08:16 +08:00
ZhangBiao 26b5a670f9 【界面优化】背包装备优化 2021-10-26 14:04:02 +08:00
ZhangBiao a6ebd138e4 【新百宝商会】提交 2021-10-21 17:28:53 +08:00
ZhangBiao d774b09a63 【御剑行】协议和资源提交 2021-10-20 14:04:40 +08:00
ZhangBiao a387432369 【主角修为】提交 2021-10-19 18:34:10 +08:00
jiaoyangna ce39857111 杨戬新资源修改提交 2021-10-08 14:18:31 +08:00
ZhangBiao 5af10faa57 【七界试炼】提交 2021-09-23 19:23:27 +08:00
luyao ca6b5ebe7d bat Resource Commit:2021/09/23,16:11:26 2021-09-23 16:11:26 +08:00
ZhangBiao dc2343073d 【七界】资源提交 2021-09-22 15:20:09 +08:00
ZhangBiao b4cd343f0e 【七界试炼】资源文件提交 2021-09-13 18:10:36 +08:00
ZhangBiao 1fefbb43e6 【七界试炼】提交 2021-09-09 11:10:43 +08:00
ZhangBiao 6078ae545a 【七界试炼】提交 2021-09-06 17:21:53 +08:00
ZhangBiao f13f1937c7 【玉虚论道】其他人信息界面 2021-08-26 18:14:46 +08:00
ZhangBiao c0ea5e1b7f 【玉虚论道】其他人编队信息界面 2021-08-26 17:14:13 +08:00
ZhangBiao 391c538ceb 【玉虚论道】提交 2021-08-26 09:59:59 +08:00
ZhangBiao e3e0ef6ead 【寻宝迷踪】res提交 2021-08-12 14:56:58 +08:00
ZhangBiao d10879ae57 【寻宝迷踪】res提交 2021-08-09 17:12:12 +08:00
ZhangBiao 4dc9136405 【寻宝迷踪】提交 2021-08-06 11:31:41 +08:00
ZhangBiao 87cf2102fe 【寻宝迷踪】添加资源 2021-08-04 18:16:36 +08:00
zhangqiang 9c28f232f6 【跨服排行榜】 2021-07-29 16:35:58 +08:00
zhangqiang 042644bdcb 【资源】冲突处理 2021-07-27 13:53:37 +08:00
ZhangBiao a33be944cc 【万象商会】提交 2021-07-22 19:53:25 +08:00
ZhangBiao db258d27cb 【副本界面】调整 2021-07-22 15:13:24 +08:00
DESKTOP-98AVA47\Administrator 9b97a35ce8 mata 文件修改提交 2021-07-15 19:44:55 +08:00
DESKTOP-98AVA47\Administrator 55607708df 资源修改提交 2021-07-15 16:19:27 +08:00
jiaoyangna 9cf8de48c6 资源提交 2021-07-01 10:28:30 +08:00
jiaoyangna 45a1079d88 大圣提交 2021-06-18 18:55:04 +08:00
ZhangBiao 683964cd8a 【惊喜礼盒】资源更换 2021-06-18 17:52:09 +08:00
ZhangBiao 54bc0f2caa 【惊喜礼盒】提价 2021-06-17 15:26:10 +08:00
ZhangBiao 0b4c5f3c8f 【惊喜礼盒】提交 2021-06-16 19:56:10 +08:00
ZhangBiao 656c8b3359 【惊喜礼盒】提交 2021-06-16 11:59:52 +08:00
zhangqiang d91c57f6ea 【心魔试炼】 2021-06-09 19:48:28 +08:00
ZhangBiao c98aa8c703 【修行】增加属性提升提示 2021-06-01 13:54:21 +08:00
ZhangBiao 5aeb2f0ed3 【修行】名字左侧印记提交 2021-05-29 18:06:15 +08:00
ZhangBiao b1e7cd1164 【修行】提交 2021-05-20 17:37:56 +08:00
ZhangBiao 3f7e243b70 【修行】this.spLoader提交 2021-05-20 09:48:52 +08:00
ZhangBiao 3bb85fd5db 【修行】新增通用恭喜界面 2021-05-19 16:56:49 +08:00
ZhangBiao 916f5af5c8 【修行】资源调整 2021-05-19 10:23:39 +08:00
ZhangBiao bcf845ae38 【修行】玩家信息界面怎加技能详情 2021-05-18 16:13:26 +08:00
zhangqiang 810139a324 【协议合并提交】刷资源提交 2021-05-17 11:28:54 +08:00
ZhangBiao d5799c1030 【修行】神印界面提交 2021-05-12 18:24:50 +08:00