Commit Graph

65 Commits (119be29c7d8fb1eb5a020b7ea330d14d4b361d7c)

Author SHA1 Message Date
JieLing 2cb5ee9176 【放生】 删除之前背景 2020-11-13 15:23:25 +08:00
zhangqiang 8b15fe28eb 【献祭坛】11.5 资源提换 2020-11-12 18:12:02 +08:00
jiaoyangna b7b4fb9d5d meta 提交 2020-11-06 13:27:52 +08:00
zhangqiang ea24696722 【逍遥游】新增地图 xbhz 2020-11-06 10:15:06 +08:00
JieLing 04ba352791 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
gaoxin c6704e6ed4 【逍遥游】修复白片问题 2020-10-20 00:38:49 +08:00
gaoxin 19135670ce Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-19 20:40:14 +08:00
gaoxin 364c9c99fc 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +08:00
ZhangBiao bae7d6550e 竞技场界面修改 2020-10-16 19:36:21 +08:00
gaoxin 7b7def3f8f 勇冠三军,叱咤风云活动添加 2020-09-27 16:09:55 +08:00
gaoxin 06afe99236 宽屏边缘用图片代替黑边 2020-09-05 19:02:20 +08:00
gaoxin 30697705be 每次销毁界面时清理一次不用的资源,界面打开音效配置添加 2020-09-04 10:03:35 +08:00
gaoxin e415076e53 主界面适配资源替换 2020-09-02 17:04:44 +08:00
zhangqiang 63ce11cda4 替换底图 2020-08-26 15:18:44 +08:00
JieLing be1d62a888 修复登陆界面扫光显示错误的问题 2020-08-26 13:47:26 +08:00
JieLing b28309e14e 资源位置移动 2020-08-25 19:26:51 +08:00
JieLing 2eeb381608 登陆界面资源替换 2020-08-25 17:56:55 +08:00
ZhangBiao c6293a0566 月卡资源替换 2020-08-25 16:09:59 +08:00
JieLing 34b2d555b6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 15:01:25 +08:00
JieLing 42a73022ac 连续充值背景体寒 2020-08-25 15:01:02 +08:00
zhangqiang 77706e50cc 首冲有礼加特效 2020-08-25 14:46:57 +08:00
zhangqiang 714545c75d 魂印效果图替换 修改公会副本 2020-08-25 10:40:13 +08:00
gaoxin b1f7318f11 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 17:18:36 +08:00
gaoxin 02c213aca8 挂机地图新增 2020-08-24 17:17:21 +08:00
ZhangBiao ec6cf58003 天尊降世入口资源替换 2020-08-24 17:04:45 +08:00
gaoxin 65aeee839d 战斗背景图修改 2020-08-24 16:34:35 +08:00
ZhangBiao 4b59561b3d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta
2020-08-24 16:08:01 +08:00
ZhangBiao 6013365ad1 剑影仙踪特效更新 2020-08-24 16:07:08 +08:00
gaoxin 74951cedd8 修复登录界面错误,修复战斗背景音乐缺失的问题 2020-08-24 14:35:45 +08:00
zhangqiang e1b223e83f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
#	data_execl/base_data/RewardGroup.xlsx
#	data_execl/base_data/RewardItemConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
#	data_execl/base_data/StoreConfig.xlsx
#	data_execl/base_data/UIConfig.xlsx
2020-08-22 13:59:35 +08:00
ZhangBiao 8391f5638f 破阵诛仙 通天教主替换资源 2020-08-22 10:20:41 +08:00
zhangqiang c67951f5fb 公会副本资源提交 2020-08-17 16:19:25 +08:00
zhangqiang cdf78a9dcf 剑影仙踪资源提交 2020-08-17 15:59:33 +08:00
JieLing 7453825d63 Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
#	Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
#	Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
#	Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
2020-08-14 17:41:21 +08:00
JieLing ad3ee94a75 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
JieLing be59c59230 部分大图资源整理 2020-08-14 10:02:24 +08:00
ZhangBiao 416d6eb16c 每日签到 2020-08-13 22:30:09 +08:00
gaoxin 4e639d2401 Merge branch 'master_develop2' into master_develop 2020-08-12 14:22:29 +08:00
jl_ios 02b7e07d20 删除无用的sdk资源,bugly添加缺少的文件 2020-08-11 14:04:05 +08:00
zhangqiang 93e1d880c8 英雄合成界面拼接 2020-08-06 18:34:04 +08:00
zhangqiang 4533695a3d 法宝归元界面提交 2020-08-07 12:22:10 +08:00
gaoxin 5ed5f7b8c4 修改Loading界面资源位置 2020-08-03 18:49:24 +08:00
gaoxin 056fbe171e loading界面资源替换 2020-07-31 16:28:13 +08:00
JieLing 6807c6c1a6 meta文件提交 2020-07-25 15:15:16 +08:00
zhangqiang abfde3e8a9 巅峰战bug and 使用按钮需求 2020-08-24 21:46:19 +08:00
JieLing bd8e859703 猕猴桃测试0.1.0 2020-07-20 20:52:30 +08:00
JieLing 2be4cc20e6 Merge branch 'master_develop' into master_test
# Conflicts:
#	.gitignore
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	data_execl/base_data/CombatControl.xlsx
#	data_execl/base_data/GuideConfig.xlsx
2020-07-16 20:08:11 +08:00
zhangqiang b682f97e66 首充第一版修改 2020-07-15 10:36:57 +08:00
JieLing 9b97aef3d7 内网 0.15.15 2020-07-10 18:20:58 +08:00